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

List:       kde-commits
Subject:    kdemultimedia/juk
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-03-01 0:55:06
Message-ID: 20040301005506.1D3D190C9 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Another slot moved to PlayerManager


  M +3 -10     juk.cpp   1.175
  M +0 -2      juk.h   1.80
  M +5 -0      playermanager.cpp   1.11
  M +2 -1      playermanager.h   1.8


--- kdemultimedia/juk/juk.cpp  #1.174:1.175
@@ -142,12 +142,4 @@ void JuK::seekForward()
 }
 
-void JuK::playPause()
-{
-    if(m_player->playing())
-        action("pause")->activate();
-    else
-        action("play")->activate();
-}
-
 void JuK::volumeUp()
 {
@@ -445,5 +437,6 @@ void JuK::setupGlobalAccels()
 {
     m_accel = new KGlobalAccel(this);
-    KeyDialog::insert(m_accel, "PlayPause",   i18n("Play/Pause"),   this, \
SLOT(playPause())); +
+    KeyDialog::insert(m_accel, "PlayPause",   i18n("Play/Pause"),   \
                action("playPause"), SLOT(activate()));
     KeyDialog::insert(m_accel, "Stop",        i18n("Stop Playing"), action("stop"), \
                SLOT(activate()));
     KeyDialog::insert(m_accel, "Back",        i18n("Back"),         this, \
SLOT(back()));

--- kdemultimedia/juk/juk.h  #1.79:1.80
@@ -51,6 +51,4 @@ public slots:
     void seekForward();
 
-    void playPause();
-
     void volumeUp();
     void volumeDown();

--- kdemultimedia/juk/playermanager.cpp  #1.10:1.11
@@ -227,4 +227,9 @@ void PlayerManager::seekPosition(int pos
 }
 
+void PlayerManager::playPause()
+{
+    playing() ? pause() : play();
+}
+
 void PlayerManager::forward()
 {

--- kdemultimedia/juk/playermanager.h  #1.7:1.8
@@ -62,4 +61,6 @@ public slots:
     virtual void seekPosition(int position);
 
+    void playPause();
+
     void forward();
     void back();


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