From f33d446f7f766b782e87df820481e1c541713318 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 14 May 2012 04:37:05 +0200 Subject: [PATCH] Make linux infoplugins real plugins --- CMakeModules/AddTomahawkPlugin.cmake | 2 +- src/infoplugins/CMakeLists.txt | 6 +++++- .../linux}/FdoNotifyPlugin.cpp | 0 .../linux}/FdoNotifyPlugin.h | 0 .../linux}/ImageConverter.cpp | 0 .../linux}/ImageConverter.h | 0 .../linux}/MprisPlugin.cpp | 0 .../unix => infoplugins/linux}/MprisPlugin.h | 0 .../linux}/MprisPluginPlayerAdaptor.cpp | 0 .../linux}/MprisPluginPlayerAdaptor.h | 0 .../linux}/MprisPluginPlayerAdaptor.xml | 0 .../linux}/MprisPluginRootAdaptor.cpp | 0 .../linux}/MprisPluginRootAdaptor.h | 0 .../linux}/MprisPluginRootAdaptor.xml | 0 src/libtomahawk/CMakeLists.txt | 13 ------------ .../infosystem/InfoSystemWorker.cpp | 20 ++----------------- 16 files changed, 8 insertions(+), 33 deletions(-) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/FdoNotifyPlugin.cpp (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/FdoNotifyPlugin.h (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/ImageConverter.cpp (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/ImageConverter.h (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPlugin.cpp (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPlugin.h (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginPlayerAdaptor.cpp (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginPlayerAdaptor.h (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginPlayerAdaptor.xml (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginRootAdaptor.cpp (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginRootAdaptor.h (100%) rename src/{libtomahawk/infosystem/infoplugins/unix => infoplugins/linux}/MprisPluginRootAdaptor.xml (100%) diff --git a/CMakeModules/AddTomahawkPlugin.cmake b/CMakeModules/AddTomahawkPlugin.cmake index 8e91dc54b..d4a8ee4b1 100644 --- a/CMakeModules/AddTomahawkPlugin.cmake +++ b/CMakeModules/AddTomahawkPlugin.cmake @@ -80,7 +80,7 @@ macro(add_tomahawk_plugin) endif() # add link targets - target_link_libraries(${TOMAHAWK_LIBRARIES}) + target_link_libraries(${target} tomahawklib) if(PLUGIN_LINK_LIBRARIES) target_link_libraries(${target} ${PLUGIN_LINK_LIBRARIES}) endif() diff --git a/src/infoplugins/CMakeLists.txt b/src/infoplugins/CMakeLists.txt index ea6f39bf1..0e515fae8 100644 --- a/src/infoplugins/CMakeLists.txt +++ b/src/infoplugins/CMakeLists.txt @@ -1 +1,5 @@ -ADD_SUBDIRECTORY( generic ) +add_subdirectory( generic ) + +if(UNIX AND NOT APPLE) + add_subdirectory( linux ) +endif() diff --git a/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp b/src/infoplugins/linux/FdoNotifyPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp rename to src/infoplugins/linux/FdoNotifyPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.h b/src/infoplugins/linux/FdoNotifyPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.h rename to src/infoplugins/linux/FdoNotifyPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.cpp b/src/infoplugins/linux/ImageConverter.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.cpp rename to src/infoplugins/linux/ImageConverter.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.h b/src/infoplugins/linux/ImageConverter.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.h rename to src/infoplugins/linux/ImageConverter.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp b/src/infoplugins/linux/MprisPlugin.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp rename to src/infoplugins/linux/MprisPlugin.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.h b/src/infoplugins/linux/MprisPlugin.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.h rename to src/infoplugins/linux/MprisPlugin.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp b/src/infoplugins/linux/MprisPluginPlayerAdaptor.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp rename to src/infoplugins/linux/MprisPluginPlayerAdaptor.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h b/src/infoplugins/linux/MprisPluginPlayerAdaptor.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h rename to src/infoplugins/linux/MprisPluginPlayerAdaptor.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.xml b/src/infoplugins/linux/MprisPluginPlayerAdaptor.xml similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.xml rename to src/infoplugins/linux/MprisPluginPlayerAdaptor.xml diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp b/src/infoplugins/linux/MprisPluginRootAdaptor.cpp similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp rename to src/infoplugins/linux/MprisPluginRootAdaptor.cpp diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.h b/src/infoplugins/linux/MprisPluginRootAdaptor.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.h rename to src/infoplugins/linux/MprisPluginRootAdaptor.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.xml b/src/infoplugins/linux/MprisPluginRootAdaptor.xml similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.xml rename to src/infoplugins/linux/MprisPluginRootAdaptor.xml diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 101f656c2..c93662b0e 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -340,19 +340,6 @@ IF(LIBATTICA_FOUND) ENDIF(LIBATTICA_FOUND) IF( UNIX AND NOT APPLE ) - LIST(APPEND libGuiSources - infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp - infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp - infosystem/infoplugins/unix/MprisPlugin.cpp - infosystem/infoplugins/unix/FdoNotifyPlugin.cpp - infosystem/infoplugins/unix/ImageConverter.cpp ) - - LIST(APPEND libGuiHeaders - infosystem/infoplugins/unix/MprisPluginRootAdaptor.h - infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h - infosystem/infoplugins/unix/MprisPlugin.h - infosystem/infoplugins/unix/FdoNotifyPlugin.h ) - IF( BUILD_GUI AND X11_FOUND ) INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm ) SET( libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp ) diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp index 9fefc1e51..a26957767 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp +++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp @@ -42,8 +42,8 @@ #include "infoplugins/mac/AdiumPlugin.h" #endif #ifdef Q_WS_X11 -#include "infoplugins/unix/FdoNotifyPlugin.h" -#include "infoplugins/unix/MprisPlugin.h" +#include "infoplugins/linux/FdoNotifyPlugin.h" +#include "infoplugins/linux/MprisPlugin.h" #endif #include "infoplugins/generic/RoviPlugin.h" @@ -87,25 +87,9 @@ InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* 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() ) ); -#endif - #ifdef Q_WS_MAC addInfoPlugin( InfoPluginPtr( new AdiumPlugin() ) ); #endif -#ifndef ENABLE_HEADLESS -#ifdef Q_WS_X11 - addInfoPlugin( InfoPluginPtr( new FdoNotifyPlugin() ) ); - addInfoPlugin( InfoPluginPtr( new MprisPlugin() ) ); -#endif -#endif }