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

List:       kde-commits
Subject:    kdemultimedia/noatun/modules/dcopiface
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2004-07-11 15:16:08
Message-ID: 20040711151608.CBE3E16B18 () office ! kde ! org
[Download RAW message or body]

CVS commit by metz: 

Enhance dcop interface with mute and increase/decrease volume functions. \
function-names are similar to other multimedia apps. This is great together with my \
enhanced kdelirc profile for noatun *hint*


  M +28 -7     dcopiface.cpp   1.33
  M +7 -2      dcopiface.h   1.25


--- kdemultimedia/noatun/modules/dcopiface/dcopiface.cpp  #1.32:1.33
@@ -19,4 +19,5 @@ extern "C"
 NIF::NIF() : Plugin(), DCOPObject("Noatun")
 {
+        mLastVolume = 0;
 //      connect(napp->player(), SIGNAL(newSong()), SLOT(newSongPlaying()));
 }
@@ -87,4 +88,28 @@ int NIF::volume()
 }
 
+void NIF::volumeUp()
+{
+        napp->player()->setVolume(napp->player()->volume() + 5);
+}
+
+void NIF::volumeDown()
+{
+        napp->player()->setVolume(napp->player()->volume() - 5);
+}
+
+void NIF::toggleMute()
+{
+        int currVol = napp->player()->volume();
+        if (currVol == 0)
+        {
+                napp->player()->setVolume(mLastVolume);
+        }
+        else
+        {
+                mLastVolume = currVol;
+                napp->player()->setVolume(0);
+        }
+}
+
 int NIF::length() // returns -1 if there's no playobject
 {
@@ -103,8 +128,6 @@ int NIF::state()
         if (napp->player()->isPaused())
                 return 1;
-        if (napp->player()->isStopped())
-                return 0;
-        //fix compile warning
-        return 0;
+
+        return 0; // default to stopped
 }
 

--- kdemultimedia/noatun/modules/dcopiface/dcopiface.h  #1.24:1.25
@@ -33,4 +33,7 @@ k_dcop:
         void setVolume(int);
         int volume();
+        void volumeUp();
+        void volumeDown();
+        void toggleMute();
 
         /**
@@ -86,4 +89,6 @@ k_dcop:
          **/
         void clear();
+private:
+        int mLastVolume; // remember volume for mute/unmute
         
 #ifdef DOCUMENTATION_BLEH_BLEH_DONT_TRY_COMPILING_THIS


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