Git commit 767b8e7b4e399954ec8dc61552ed01f4f62c808f by Nick Shaforostoff.
Committed on 30/11/2015 at 23:44.
Pushed by shaforo into branch 'frameworks'.

port mediaplayer plugin

M  +4    -2    plugins/CMakeLists.txt
M  +21   -19   plugins/mediaplayer/CMakeLists.txt
M  +1    -1    plugins/mediaplayer/ktmediaplayerplugin.kcfg
R  +0    -0    plugins/mediaplayer/ktorrent_mediaplayer.desktop [from: plug=
ins/mediaplayer/ktmediaplayerplugin.desktop - 100% similarity]
R  +0    -0    plugins/mediaplayer/ktorrent_mediaplayerui.rc [from: plugins=
/mediaplayer/ktmediaplayerpluginui.rc - 100% similarity]
M  +7    -4    plugins/mediaplayer/mediaplayerplugin.cpp
M  +1    -1    plugins/mediaplayer/mediaplayerplugin.h
M  +1    -0    plugins/mediaplayer/playlistwidget.cpp

http://commits.kde.org/ktorrent/767b8e7b4e399954ec8dc61552ed01f4f62c808f

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index cc3e5a7..585b22c 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -9,6 +9,8 @@ endif (${_option})
 ENDMACRO (MACRO_KT_PLUGIN)
 =

 find_package(Taglib)
+#find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Multimedia Multime=
diaWidgets)
+find_package(Phonon4Qt5)
 =

 #macro_kt_plugin(ENABLE_LOGVIEWER_PLUGIN logviewer logviewer)
 macro_kt_plugin(ENABLE_INFOWIDGET_PLUGIN infowidget infowidget)
@@ -19,8 +21,8 @@ macro_kt_plugin(ENABLE_INFOWIDGET_PLUGIN infowidget infow=
idget)
 #macro_kt_plugin(ENABLE_IPFILTER_PLUGIN ipfilter ipfilter)
 #macro_kt_plugin(ENABLE_STATS_PLUGIN stats stats)
 #macro_kt_plugin(ENABLE_BWSCHEDULER_PLUGIN bwscheduler bwscheduler)
-if (TAGLIB_FOUND)
-#  macro_kt_plugin(ENABLE_MEDIAPLAYER_PLUGIN mediaplayer mediaplayer)
+if (TAGLIB_FOUND AND PHONON_FOUND_EXPERIMENTAL) #AND Qt5Multimedia_FOUND)
+  macro_kt_plugin(ENABLE_MEDIAPLAYER_PLUGIN mediaplayer mediaplayer)
 endif(TAGLIB_FOUND)  =

 #macro_kt_plugin(ENABLE_SCRIPTING_PLUGIN scripting scripting)
 #macro_kt_plugin(ENABLE_SYNDICATION_PLUGIN syndication syndication)
diff --git a/plugins/mediaplayer/CMakeLists.txt b/plugins/mediaplayer/CMake=
Lists.txt
index 6174bfe..f1df3e4 100644
--- a/plugins/mediaplayer/CMakeLists.txt
+++ b/plugins/mediaplayer/CMakeLists.txt
@@ -1,17 +1,20 @@
 find_package(Taglib REQUIRED)
 include_directories(${TAGLIB_INCLUDES})
+#find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Multimedia MultimediaW=
idgets)
+#include_directories(${Qt5Multimedia_INCLUDE_DIRS})
+include_directories(${PHONON_INCLUDES})
 =

-set(ktmediaplayerplugin_SRC =

-	mediacontroller.cpp =

-	playlist.cpp =

-	playlistwidget.cpp =

-	mediaplayeractivity.cpp =

-	mediaplayerplugin.cpp =

-	mediaview.cpp =

-	mediamodel.cpp =

-	mediafile.cpp =

-	mediafilestream.cpp =

-	mediaplayer.cpp =

+set(ktmediaplayerplugin_SRC
+	mediacontroller.cpp
+	playlist.cpp
+	playlistwidget.cpp
+	mediaplayeractivity.cpp
+	mediaplayerplugin.cpp
+	mediaview.cpp
+	mediamodel.cpp
+	mediafile.cpp
+	mediafilestream.cpp
+	mediaplayer.cpp
 	videowidget.cpp
 	videochunkbar.cpp
 )
@@ -21,19 +24,18 @@ qt5_add_dbus_interface(ktmediaplayerplugin_SRC ${screen=
saver_xml} screensaver_in
 =

 ki18n_wrap_ui(ktmediaplayerplugin_SRC mediacontroller.ui)
 kconfig_add_kcfg_files(ktmediaplayerplugin_SRC mediaplayerpluginsettings.k=
cfgc)
-add_library(ktmediaplayerplugin MODULE ${ktmediaplayerplugin_SRC})
+add_library(ktorrent_mediaplayer MODULE ${ktmediaplayerplugin_SRC})
+
+kcoreaddons_desktop_to_json(ktorrent_mediaplayer ktorrent_mediaplayer.desk=
top)
 =

 target_link_libraries(
-    ktmediaplayerplugin
+    ktorrent_mediaplayer
     ktcore
     ${LIBKTORRENT_LIBRARIES}
     ${TAGLIB_LIBRARIES}
     KF5::KDELibs4Support
-    KF5::Parts
     Phonon::phonon4qt5
-    Qt5::Core
-    Qt5::Gui
+#    Qt5::MultimediaWidgets
     )
-install(TARGETS ktmediaplayerplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(FILES ktmediaplayerplugin.desktop  DESTINATION  ${SERVICES_INSTALL=
_DIR} )
-install(FILES ktmediaplayerpluginui.rc DESTINATION ${DATA_INSTALL_DIR}/kto=
rrent )
+install(TARGETS ktorrent_mediaplayer DESTINATION ${KTORRENT_PLUGIN_INSTALL=
_DIR} )
+install(FILES ktorrent_mediaplayerui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}=
/ktorrent )
diff --git a/plugins/mediaplayer/ktmediaplayerplugin.kcfg b/plugins/mediapl=
ayer/ktmediaplayerplugin.kcfg
index fd2de2a..f259bf4 100644
--- a/plugins/mediaplayer/ktmediaplayerplugin.kcfg
+++ b/plugins/mediaplayer/ktmediaplayerplugin.kcfg
@@ -4,7 +4,7 @@
 		xsi:schemaLocation=3D"http://www.kde.org/standards/kcfg/1.0
 		http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 		=

-	<kcfgfile name=3D"ktmediaplayerpluginrc"/>
+	<kcfgfile name=3D"ktorrent_mediaplayerrc"/>
 	<group name=3D"general">
 		<entry name=3D"skipVideos" type=3D"Bool">
 			<default>true</default>
diff --git a/plugins/mediaplayer/ktmediaplayerplugin.desktop b/plugins/medi=
aplayer/ktorrent_mediaplayer.desktop
similarity index 100%
rename from plugins/mediaplayer/ktmediaplayerplugin.desktop
rename to plugins/mediaplayer/ktorrent_mediaplayer.desktop
diff --git a/plugins/mediaplayer/ktmediaplayerpluginui.rc b/plugins/mediapl=
ayer/ktorrent_mediaplayerui.rc
similarity index 100%
rename from plugins/mediaplayer/ktmediaplayerpluginui.rc
rename to plugins/mediaplayer/ktorrent_mediaplayerui.rc
diff --git a/plugins/mediaplayer/mediaplayerplugin.cpp b/plugins/mediaplaye=
r/mediaplayerplugin.cpp
index f690c5b..a68b90f 100644
--- a/plugins/mediaplayer/mediaplayerplugin.cpp
+++ b/plugins/mediaplayer/mediaplayerplugin.cpp
@@ -18,23 +18,24 @@
  *   Free Software Foundation, Inc.,                                      =
 *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.         =
 *
  *************************************************************************=
**/
+#include "mediaplayerplugin.h"
+
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <util/log.h>
 #include <util/logsystemmanager.h>
 #include <interfaces/guiinterface.h>
-#include "mediaplayerplugin.h"
 #include "mediaplayeractivity.h"
 =

 =

-K_EXPORT_COMPONENT_FACTORY(ktmediaplayerplugin, KGenericFactory<kt::MediaP=
layerPlugin>("ktmediaplayerplugin"))
+K_PLUGIN_FACTORY_WITH_JSON(ktorrent_mediaplayer, "ktorrent_mediaplayer.jso=
n", registerPlugin<kt::MediaPlayerPlugin>();)
 =

 using namespace bt;
 =

 namespace kt
 {
 =

-    MediaPlayerPlugin::MediaPlayerPlugin(QObject* parent, const QStringLis=
t& args) : Plugin(parent)
+    MediaPlayerPlugin::MediaPlayerPlugin(QObject* parent, const QVariantLi=
st& args) : Plugin(parent)
     {
         Q_UNUSED(args);
     }
@@ -50,7 +51,7 @@ namespace kt
         CoreInterface* core =3D getCore();
         act =3D new MediaPlayerActivity(core, actionCollection(), 0);
         getGUI()->addActivity(act);
-        setXMLFile("ktmediaplayerpluginui.rc");
+        setXMLFile("ktorrent_mediaplayerui.rc");
         act->enableActions(0);
         act->loadState(KGlobal::config());
     }
@@ -72,3 +73,5 @@ namespace kt
 =

 =

 }
+
+#include "mediaplayerplugin.moc"
diff --git a/plugins/mediaplayer/mediaplayerplugin.h b/plugins/mediaplayer/=
mediaplayerplugin.h
index 8ee42d1..eb9aaef 100644
--- a/plugins/mediaplayer/mediaplayerplugin.h
+++ b/plugins/mediaplayer/mediaplayerplugin.h
@@ -38,7 +38,7 @@ namespace kt
     {
         Q_OBJECT
     public:
-        MediaPlayerPlugin(QObject* parent, const QStringList& args);
+        MediaPlayerPlugin(QObject* parent, const QVariantList& args);
         virtual ~MediaPlayerPlugin();
 =

         virtual void load();
diff --git a/plugins/mediaplayer/playlistwidget.cpp b/plugins/mediaplayer/p=
laylistwidget.cpp
index b3154e5..817f9b6 100644
--- a/plugins/mediaplayer/playlistwidget.cpp
+++ b/plugins/mediaplayer/playlistwidget.cpp
@@ -23,6 +23,7 @@
 #include <QVBoxLayout>
 #include <ktoolbar.h>
 #include <klocale.h>
+#include <kurl.h>
 #include <QIcon>
 #include <kfiledialog.h>
 #include "mediaplayer.h"