From 380ff0d23d499cc32f494c2df5a16c2f2a361eea Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 14 May 2012 04:19:46 +0200 Subject: [PATCH] Make generic infoplugins real plugins --- src/infoplugins/generic/CMakeLists.txt | 21 ++++++++++++++++++- .../infoplugins/generic/ChartsPlugin.cpp | 0 .../infoplugins/generic/ChartsPlugin.h | 0 .../infoplugins/generic/ChartsPlugin_Data_p.h | 0 .../infoplugins/generic/MusixMatchPlugin.cpp | 0 .../infoplugins/generic/MusixMatchPlugin.h | 0 .../infoplugins/generic/NewReleasesPlugin.cpp | 0 .../infoplugins/generic/NewReleasesPlugin.h | 0 .../infoplugins/generic/RoviPlugin.cpp | 0 .../infoplugins/generic/RoviPlugin.h | 0 .../infoplugins/generic/hypemPlugin.cpp | 0 .../infoplugins/generic/hypemPlugin.h | 0 .../infoplugins/generic/musicbrainzPlugin.cpp | 0 .../infoplugins/generic/musicbrainzPlugin.h | 0 .../infoplugins/generic/spotifyPlugin.cpp | 0 .../infoplugins/generic/spotifyPlugin.h | 0 src/libtomahawk/CMakeLists.txt | 8 ------- .../infosystem/InfoSystemWorker.cpp | 16 +++++++------- 18 files changed, 28 insertions(+), 17 deletions(-) rename src/{libtomahawk/infosystem => }/infoplugins/generic/ChartsPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/ChartsPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/ChartsPlugin_Data_p.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/MusixMatchPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/MusixMatchPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/NewReleasesPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/NewReleasesPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/RoviPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/RoviPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/hypemPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/hypemPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/musicbrainzPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/musicbrainzPlugin.h (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/spotifyPlugin.cpp (100%) rename src/{libtomahawk/infosystem => }/infoplugins/generic/spotifyPlugin.h (100%) diff --git a/src/infoplugins/generic/CMakeLists.txt b/src/infoplugins/generic/CMakeLists.txt index 0a9ed2c32..a7d47e094 100644 --- a/src/infoplugins/generic/CMakeLists.txt +++ b/src/infoplugins/generic/CMakeLists.txt @@ -1 +1,20 @@ -ADD_SUBDIRECTORY( echonest ) + +add_subdirectory(echonest) + +list(APPEND simple_plugins + Charts + NewReleases + spotify + hypem + MusixMatch + musicbrainz + Rovi +) + +foreach(simple_plugin ${simple_plugins}) + add_tomahawk_plugin(${simple_plugin} + TYPE infoplugin EXPORT_MACRO INFOPLUGINDLLEXPORT_PRO + SOURCES "${simple_plugin}Plugin.cpp" + LINK_LIBRARIES ${TOMAHAWK_LIBRARIES} + ) +endforeach() diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp b/src/infoplugins/generic/ChartsPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp rename to src/infoplugins/generic/ChartsPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h b/src/infoplugins/generic/ChartsPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h rename to src/infoplugins/generic/ChartsPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h b/src/infoplugins/generic/ChartsPlugin_Data_p.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h rename to src/infoplugins/generic/ChartsPlugin_Data_p.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp b/src/infoplugins/generic/MusixMatchPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp rename to src/infoplugins/generic/MusixMatchPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.h b/src/infoplugins/generic/MusixMatchPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.h rename to src/infoplugins/generic/MusixMatchPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp b/src/infoplugins/generic/NewReleasesPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp rename to src/infoplugins/generic/NewReleasesPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.h b/src/infoplugins/generic/NewReleasesPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.h rename to src/infoplugins/generic/NewReleasesPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp b/src/infoplugins/generic/RoviPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp rename to src/infoplugins/generic/RoviPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h b/src/infoplugins/generic/RoviPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h rename to src/infoplugins/generic/RoviPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp b/src/infoplugins/generic/hypemPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp rename to src/infoplugins/generic/hypemPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h b/src/infoplugins/generic/hypemPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h rename to src/infoplugins/generic/hypemPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp b/src/infoplugins/generic/musicbrainzPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp rename to src/infoplugins/generic/musicbrainzPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h b/src/infoplugins/generic/musicbrainzPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h rename to src/infoplugins/generic/musicbrainzPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp b/src/infoplugins/generic/spotifyPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp rename to src/infoplugins/generic/spotifyPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h b/src/infoplugins/generic/spotifyPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h rename to src/infoplugins/generic/spotifyPlugin.h diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 75290e04b..101f656c2 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -254,14 +254,6 @@ set( libSources infosystem/InfoSystemCache.cpp infosystem/InfoSystemWorker.cpp - infosystem/infoplugins/generic/ChartsPlugin.cpp - infosystem/infoplugins/generic/NewReleasesPlugin.cpp - infosystem/infoplugins/generic/spotifyPlugin.cpp - infosystem/infoplugins/generic/hypemPlugin.cpp - infosystem/infoplugins/generic/MusixMatchPlugin.cpp - infosystem/infoplugins/generic/musicbrainzPlugin.cpp - infosystem/infoplugins/generic/RoviPlugin.cpp - network/BufferIoDevice.cpp network/MsgProcessor.cpp network/StreamConnection.cpp diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp index d521bebbf..9fefc1e51 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp +++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp @@ -86,15 +86,15 @@ InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* cache ) m_cache = cache; loadInfoPlugins( findInfoPlugins() ); - + #ifndef ENABLE_HEADLESS - addInfoPlugin( InfoPluginPtr( new MusixMatchPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new MusicBrainzPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new ChartsPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new NewReleasesPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new RoviPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new SpotifyPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new hypemPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new MusixMatchPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new MusicBrainzPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new ChartsPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new NewReleasesPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new RoviPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new SpotifyPlugin() ) ); +// addInfoPlugin( InfoPluginPtr( new hypemPlugin() ) ); #endif #ifdef Q_WS_MAC