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

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Max Howell <max.howell () methylblue ! com>
Date:       2004-07-07 1:44:48
Message-ID: 20040707014448.887D999A9 () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

* Do mute properly, although perhaps a better OSD would be nice
* Fix mute for hardware mixer case?
* ALERT! aRts volume control  seems broken!


  M +13 -0     enginecontroller.cpp   1.31
  M +1 -13     enginecontroller.h   1.13


--- kdeextragear-1/amarok/src/enginecontroller.cpp  #1.30:1.31
@@ -259,4 +259,17 @@ int EngineController::setVolume( int per
 }
 
+void EngineController::mute()
+{
+    if( m_muteVolume == 0 )
+    {
+        m_muteVolume = m_pEngine->volume();
+        setVolume( 0 );
+    }
+    else
+    {
+        setVolume( m_muteVolume );
+        m_muteVolume = 0;
+    }
+}
 
 void EngineController::newMetaData( const MetaBundle &bundle )

--- kdeextragear-1/amarok/src/enginecontroller.h  #1.12:1.13
@@ -60,17 +60,5 @@ public slots:
     int setVolume( int percent );
 
-    void mute()
-    {
-        if( m_muteVolume == 0 )
-        {
-            m_muteVolume = m_pEngine->volume();
-            m_pEngine->setVolume( 0 );
-        }
-        else
-        {
-            m_pEngine->setVolume( m_muteVolume );
-            m_muteVolume = 0;
-        }
-    }
+    void mute();
 
 signals:


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