extragear/multimedia/amarok/src

[Martin Aumueller]

On Sun Feb 18 2007, Dan Meltzer wrote:
> SVN commit 634675 by dmeltzer:
>
> Clean up the export situation.  We should only need AMAROK_EXPORT (not an
> export for each lib).

I don't expect that to work: a symbol from the metadata library will be used 
from within libamarok. This means the it should have the KDE_IMPORT 
attribute, as it is to be imported from the metadata library into libamarok. 
However, all symbols from libamarok should have the KDE_EXPORT attribute when 
libamarok is compiled, otherwise they won't be visible outside of libamarok.
>
>  M  +0 -37     amarok_export.h
>  M  +1 -1      engine/phonon/phonon-engine.h
>  M  +1 -1      engine/xine/xine-engine.h
>  M  +1 -1      metadata/m4a/mp4file.h
>  M  +1 -1      metadata/m4a/mp4itunestag.h
>  M  +1 -1      metadata/mp4/mp4file.h
>  M  +1 -1      metadata/mp4/mp4tag.h
>  M  +1 -1      metadata/tplugins.cpp
>  M  +1 -1      metadata/tplugins.h
>
>
> --- trunk/extragear/multimedia/amarok/src/amarok_export.h #634674:634675
> @@ -15,45 +15,8 @@
>  # endif
>  #endif
>
> -#ifndef AMAROK_TAGLIB_EXPORT
> -# ifdef MAKE_AMAROK_TAGLIB_LIB
> -#  define AMAROK_TAGLIB_EXPORT KDE_EXPORT
> -# else
> -#  define AMAROK_TAGLIB_EXPORT KDE_IMPORT
> -# endif
> -#endif
> -
> -#ifndef AMAROK_XINE_ENGINE_EXPORT
> -# ifdef MAKE_AMAROK_XINE_ENGINE_PART
> -#  define AMAROK_XINE_ENGINE_EXPORT KDE_EXPORT
> -# else
> -#  define AMAROK_XINE_ENGINE_EXPORT KDE_IMPORT
> -# endif
> -#endif
> -
> -#ifndef AMAROK_HELIX_ENGINE_EXPORT
> -# ifdef MAKE_AMAROK_HELIX_ENGINE_PART
> -#  define AMAROK_HELIX_ENGINE_EXPORT KDE_EXPORT
> -# else
> -#  define AMAROK_HELIX_ENGINE_EXPORT KDE_IMPORT
> -# endif
> -#endif
> -
> -#ifndef AMAROK_PHONON_ENGINE_EXPORT
> -# ifdef MAKE_PHONON_ENGINE_PART
> -#  define AMAROK_PHONON_ENGINE_EXPORT KDE_EXPORT
> -# else
> -#  define AMAROK_PHONON_ENGINE_EXPORT KDE_IMPORT
> -# endif
> -#endif
> -
>  #else // not windows
> -
>  #define AMAROK_EXPORT KDE_EXPORT
> -#define AMAROK_TAGLIB_EXPORT KDE_EXPORT
> -#define AMAROK_XINE_ENGINE_EXPORT KDE_EXPORT
> -#define AMAROK_HELIX_ENGINE_EXPORT KDE_EXPORT
> -#define AMAROK_PHONON_ENGINE_EXPORT KDE_EXPORT
>  #endif /* not windows */
>
>  #endif /* _AMAROK_EXPORT_H */
> --- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.h
> #634674:634675 @@ -31,7 +31,7 @@
>      class AudioOutput;
>  }
>
> -class AMAROK_PHONON_ENGINE_EXPORT PhononEngine : public Engine::Base
> +class AMAROK_EXPORT PhononEngine : public Engine::Base
>  {
>      Q_OBJECT
>
> --- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.h
> #634674:634675 @@ -26,7 +26,7 @@
>
>  class XineConfigDialog;
>
> -class AMAROK_XINE_ENGINE_EXPORT XineEngine : public Engine::Base
> +class AMAROK_EXPORT XineEngine : public Engine::Base
>  {
>      Q_OBJECT
>
> --- trunk/extragear/multimedia/amarok/src/metadata/m4a/mp4file.h
> #634674:634675 @@ -68,7 +68,7 @@
>       * information specific to mp4 itunes files. (TODO)
>       */
>
> -    class AMAROK_TAGLIB_EXPORT File : public TagLib::File
> +    class AMAROK_EXPORT File : public TagLib::File
>      {
>      public:
>        /*!
> --- trunk/extragear/multimedia/amarok/src/metadata/m4a/mp4itunestag.h
> #634674:634675 @@ -33,7 +33,7 @@
>    {
>      class File;
>
> -    class AMAROK_TAGLIB_EXPORT Tag : public TagLib::Tag
> +    class AMAROK_EXPORT Tag : public TagLib::Tag
>      {
>      public:
>        /*!
> --- trunk/extragear/multimedia/amarok/src/metadata/mp4/mp4file.h
> #634674:634675 @@ -31,7 +31,7 @@
>
>          class Tag;
>
> -        class AMAROK_TAGLIB_EXPORT File : public TagLib::File
> +        class AMAROK_EXPORT File : public TagLib::File
>          {
>              public:
>                  /*!
> --- trunk/extragear/multimedia/amarok/src/metadata/mp4/mp4tag.h
> #634674:634675 @@ -32,7 +32,7 @@
>          /*!
>           * This implements the generic TagLib::Tag API
>           */
> -        class AMAROK_TAGLIB_EXPORT Tag : public TagLib::Tag
> +        class AMAROK_EXPORT Tag : public TagLib::Tag
>          {
>              public:
>                  static const int Undefined = -1;
> --- trunk/extragear/multimedia/amarok/src/metadata/tplugins.cpp
> #634674:634675 @@ -131,7 +131,7 @@
>  }
>  #endif
>
> -AMAROK_TAGLIB_EXPORT void registerTaglibPlugins()
> +AMAROK_EXPORT void registerTaglibPlugins()
>  {
>  #ifdef KMIMETYPE_RESOLVER
>      TagLib::FileRef::addFileTypeResolver(new MimeTypeFileTypeResolver);
> --- trunk/extragear/multimedia/amarok/src/metadata/tplugins.h
> #634674:634675 @@ -23,6 +23,6 @@
>  #define METADATA_TPLUGIN_H
>  #include <amarok_export.h>
>
> -void AMAROK_TAGLIB_EXPORT registerTaglibPlugins();
> +void AMAROK_EXPORT registerTaglibPlugins();
>
>  #endif