From 6cfac1978ecb42c5bf8616cd5246cf671383b43a Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 14 May 2012 13:10:59 -0400 Subject: [PATCH] Migrate charts plugin --- src/infoplugins/generic/CMakeLists.txt | 1 + src/infoplugins/generic/charts/CMakeLists.txt | 43 +++++++++++++++++++ .../generic/charts}/ChartsPlugin.cpp | 22 +++++++--- .../generic/charts}/ChartsPlugin.h | 8 ++-- src/libtomahawk/CMakeLists.txt | 1 - .../ChartsPlugin_Data_p.h => CountryUtils.h} | 0 .../infosystem/InfoSystemWorker.cpp | 2 - .../infoplugins/generic/NewReleasesPlugin.cpp | 2 +- .../infoplugins/generic/spotifyPlugin.cpp | 2 +- 9 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 src/infoplugins/generic/charts/CMakeLists.txt rename src/{libtomahawk/infosystem/infoplugins/generic => infoplugins/generic/charts}/ChartsPlugin.cpp (98%) rename src/{libtomahawk/infosystem/infoplugins/generic => infoplugins/generic/charts}/ChartsPlugin.h (94%) rename src/libtomahawk/{infosystem/infoplugins/generic/ChartsPlugin_Data_p.h => CountryUtils.h} (100%) diff --git a/src/infoplugins/generic/CMakeLists.txt b/src/infoplugins/generic/CMakeLists.txt index 880be9043..663bfc41b 100644 --- a/src/infoplugins/generic/CMakeLists.txt +++ b/src/infoplugins/generic/CMakeLists.txt @@ -1,2 +1,3 @@ ADD_SUBDIRECTORY( echonest ) ADD_SUBDIRECTORY( hypem ) +ADD_SUBDIRECTORY( charts ) diff --git a/src/infoplugins/generic/charts/CMakeLists.txt b/src/infoplugins/generic/charts/CMakeLists.txt new file mode 100644 index 000000000..36f52e154 --- /dev/null +++ b/src/infoplugins/generic/charts/CMakeLists.txt @@ -0,0 +1,43 @@ +project( tomahawk ) + +include( ${QT_USE_FILE} ) +add_definitions( ${QT_DEFINITIONS} ) +add_definitions( -DQT_PLUGIN ) +add_definitions( -DQT_SHARED ) +add_definitions( -DINFOPLUGINDLLEXPORT_PRO ) + +set( chartsInfoPluginSources + ChartsPlugin.cpp +) + +set( chartsInfoPluginHeaders + ChartsPlugin.h +) + +include_directories( + ${QT_INCLUDE_DIR} +) + +qt4_wrap_cpp( chartsInfoPluginMoc ${chartsInfoPluginHeaders} ) +add_library( tomahawk_infoplugin_charts SHARED ${chartsInfoPluginSources} ${chartsInfoPluginMoc} ${RC_SRCS} ) + +IF( WIN32 ) +SET( OS_SPECIFIC_LINK_LIBRARIES + ${OS_SPECIFIC_LINK_LIBRARIES} + "winmm.dll" + "iphlpapi.a" +) +ENDIF( WIN32 ) + +target_link_libraries( tomahawk_infoplugin_charts + ${TOMAHAWK_LIBRARIES} + ${QT_LIBRARIES} + ${OS_SPECIFIC_LINK_LIBRARIES} +) + +IF( APPLE ) +# SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" ) +ENDIF( APPLE ) + +install( TARGETS tomahawk_infoplugin_charts DESTINATION ${CMAKE_INSTALL_LIBDIR} ) + diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp b/src/infoplugins/generic/charts/ChartsPlugin.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp rename to src/infoplugins/generic/charts/ChartsPlugin.cpp index 3eac27215..52b02624d 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp +++ b/src/infoplugins/generic/charts/ChartsPlugin.cpp @@ -21,13 +21,14 @@ #include "ChartsPlugin.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "Album.h" -#include "ChartsPlugin_Data_p.h" +#include "CountryUtils.h" #include "Typedefs.h" #include "audio/AudioEngine.h" #include "TomahawkSettings.h" @@ -40,8 +41,11 @@ #include #include -using namespace Tomahawk::InfoSystem; +namespace Tomahawk +{ +namespace InfoSystem +{ ChartsPlugin::ChartsPlugin() : InfoPlugin() @@ -631,3 +635,9 @@ ChartsPlugin::chartReturned() tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching chart:" << reply->url().toString(); } + +} + +} + +Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::ChartsPlugin ) \ No newline at end of file diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h b/src/infoplugins/generic/charts/ChartsPlugin.h similarity index 94% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h rename to src/infoplugins/generic/charts/ChartsPlugin.h index 31cb1c696..d521bb19a 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h +++ b/src/infoplugins/generic/charts/ChartsPlugin.h @@ -20,10 +20,11 @@ #ifndef ChartsPlugin_H #define ChartsPlugin_H +#include "infoplugins/InfoPluginDllMacro.h" #include "infosystem/InfoSystem.h" #include "infosystem/InfoSystemWorker.h" -#include -#include +#include +#include class QNetworkReply; @@ -33,9 +34,10 @@ namespace Tomahawk namespace InfoSystem { -class ChartsPlugin : public InfoPlugin +class INFOPLUGINDLLEXPORT ChartsPlugin : public InfoPlugin { Q_OBJECT + Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin ) public: ChartsPlugin(); diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 65cd41960..afff4a44f 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -254,7 +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/MusixMatchPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h b/src/libtomahawk/CountryUtils.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h rename to src/libtomahawk/CountryUtils.h diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp index 4f1c01505..80da14037 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp +++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp @@ -31,7 +31,6 @@ #include "InfoSystemCache.h" #include "infoplugins/generic/echonest/EchonestPlugin.h" #include "infoplugins/generic/MusixMatchPlugin.h" -#include "infoplugins/generic/ChartsPlugin.h" #include "infoplugins/generic/NewReleasesPlugin.h" #include "infoplugins/generic/spotifyPlugin.h" #include "infoplugins/generic/musicbrainzPlugin.h" @@ -91,7 +90,6 @@ InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* cache ) #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() ) ); diff --git a/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp index 9781a2118..591ad3f05 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp @@ -6,7 +6,7 @@ #include #include "Album.h" -#include "ChartsPlugin_Data_p.h" +#include "CountryUtils.h" #include "Typedefs.h" #include "audio/AudioEngine.h" #include "TomahawkSettings.h" diff --git a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp index e38ee5a9c..c7bcf174e 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp @@ -31,7 +31,7 @@ #include "TomahawkSettings.h" #include "utils/TomahawkUtils.h" #include "utils/Logger.h" -#include "ChartsPlugin_Data_p.h" +#include "CountryUtils.h" #define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/" #include