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

List:       kde-commits
Subject:    kdeaddons/kicker-applets/mediacontrol
From:       Stanislav Karchebny <berk () upnet ! ru>
Date:       2004-02-29 9:28:56
Message-ID: 20040229092856.59890995A () office ! kde ! org
[Download RAW message or body]

CVS commit by karchebny: 

* Added a long-standing patch to add amaroK support.
  Really, someone just forgot to commit it about two months ago =)


  A            amarokInterface.cpp   1.1 [GPL (v2+)]
  A            amarokInterface.h   1.1 [GPL (v2+)]
  M +2 -2      Makefile.am   1.10
  M +8 -0      mediacontrol.cpp   1.23
  M +2 -0      mediacontrolconfig.cpp   1.6


--- kdeaddons/kicker-applets/mediacontrol/Makefile.am  #1.9:1.10
@@ -8,10 +8,10 @@
    mediacontrol.cpp playerInterface.cpp noatunInterface.cpp xmmsInterface.cpp \
    configfrontend.cpp mediacontrolconfigwidget.ui mediacontrolconfig.cpp \
-   mediacontroliface.skel jukInterface.cpp
+   mediacontroliface.skel jukInterface.cpp amarokInterface.cpp
 mediacontrol_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 mediacontrol_panelapplet_la_LIBADD = $(LIB_KDEUI) $(XMMS_LIBS)
 
 noinst_HEADERS = mediacontrol.h  playerInterface.h noatunInterface.h xmmsInterface.h \
                \
-                 configfrontend.h  mediacontroliface.h mediacontrolconfig.h \
jukInterface.h +                 configfrontend.h  mediacontroliface.h \
mediacontrolconfig.h jukInterface.h amarokInterface.h  
 KDE_ICON = AUTO

--- kdeaddons/kicker-applets/mediacontrol/mediacontrol.cpp  #1.22:1.23
@@ -28,4 +28,5 @@
 #include "noatunInterface.h"
 #include "jukInterface.h"
+#include "amarokInterface.h"
 
 #include <qfile.h>
@@ -307,4 +308,11 @@ void MediaControl::reparseConfig()
                         (_configFrontend->mouseWheelSpeed()));
         }
+        if ( playerString == "Amarok")
+        {
+                kdDebug() << "player = Amarok" << endl;
+                _player = new AmarokInterface();
+                time_slider->setSteps((_configFrontend->mouseWheelSpeed()),
+                        (_configFrontend->mouseWheelSpeed()));
+        }
 
         //  this signal gets emitted by a playerInterface when the player's playtime \
changed

--- kdeaddons/kicker-applets/mediacontrol/mediacontrolconfig.cpp  #1.5:1.6
@@ -60,4 +60,6 @@ MediaControlConfig::MediaControlConfig( 
         _child->playerListBox->insertItem("Noatun", -1);
 
+        _child->playerListBox->insertItem("Amarok", -1);
+
         _child->playerListBox->insertItem("JuK", -1);
 


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