[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Charles Samuels <charles () kde ! org>
Date:       2007-09-28 2:16:03
Message-ID: 1190945763.074133.27178.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 718045 by charles:

Beginning to KPartify noatun, just backing up my disk drive on svn.kde.org



 M  +1 -0      CMakeLists.txt  
 M  +3 -3      library/pluginloader.cpp  
 M  +1 -1      modules/noatunui/noatun_milkchocolate.desktop  
 M  +2 -0      modules/noatunui/userinterface.cpp  
 M  +1 -1      modules/noatunui/userinterface.h  
 A             part (directory)  
 A             part/CMakeLists.txt  
 A             part/factory.cpp   [License: BSD]
 A             part/noatunpart.desktop  
 A             part/part.cpp   [License: no copyright]
 A             part/part.h   [License: no copyright]


--- trunk/KDE/kdemultimedia/noatun/CMakeLists.txt #718044:718045
@@ -2,6 +2,7 @@
 add_subdirectory( pics ) 
 add_subdirectory( library ) 
 add_subdirectory( app ) 
+add_subdirectory( part ) 
 add_subdirectory( modules ) 
 
 ########### install files ###############
--- trunk/KDE/kdemultimedia/noatun/library/pluginloader.cpp #718044:718045
@@ -294,7 +294,7 @@
 	for (it = modules.begin(); it != modules.end(); ++it )
 		d->pluginsToLoad.push(*it);
 
-	QTimer::singleShot(0, this, SLOT(slotLoadScheduledPlugin()));
+	slotLoadScheduledPlugin();
 	return true;
 }
 
@@ -302,7 +302,7 @@
 void PluginHandler::loadPlugin(const QString &pluginName)
 {
 	d->pluginsToLoad.push(pluginName);
-	QTimer::singleShot(0, this, SLOT(slotLoadScheduledPlugin()));
+	slotLoadScheduledPlugin();
 }
 
 
@@ -325,7 +325,7 @@
 	kDebug(66666) << "Going to load '" << key << "' ...";
 	loadPluginInternal(key);
 
-	QTimer::singleShot(0, this, SLOT(slotLoadScheduledPlugin()));
+	slotLoadScheduledPlugin();
 }
 
 
--- trunk/KDE/kdemultimedia/noatun/modules/noatunui/noatun_milkchocolate.desktop #718044:718045
@@ -4,7 +4,7 @@
 Type=Service
 X-KDE-Library=noatun_milkchocolate
 X-Noatun-Version=300
-X-Noatun-Interfaces=userinterface
+X-Noatun-Interfaces=userinterface,KMediaPlayer::View
 X-KDE-PluginInfo-Name=noatun_milkchocolate
 X-KDE-PluginInfo-Author=Charles Samuels, Stefan Gehn
 X-KDE-PluginInfo-Email=charles@kde.org
--- trunk/KDE/kdemultimedia/noatun/modules/noatunui/userinterface.cpp #718044:718045
@@ -40,6 +40,8 @@
 {
 	if (n == "FrontendInterface")
 		return this;
+	else if (n == KMediaPlayer::View)
+		return this;
 	return 0;
 }
 
--- trunk/KDE/kdemultimedia/noatun/modules/noatunui/userinterface.h #718044:718045
@@ -22,7 +22,7 @@
 using namespace Noatun;
 
 
-class MilkChocolate : public NMainWindow
+class MilkChocolate : public NMainWindow, public KMediaPlayer::View
 {
 	Q_OBJECT
 	Global *nInstance;
[prev in list] [next in list] [prev in thread] [next in thread]