Bug 132228

Summary: If unmuting by increasing volume, muting again will change volume to original
Product: [Applications] amarok Reporter: Pasi Saarinen <Saarinen.pasi>
Component: generalAssignee: Amarok Bugs <amarok-bugs-null>
Status: RESOLVED FIXED    
Severity: normal    
Priority: NOR    
Version First Reported In: 1.4.1   
Target Milestone: ---   
Platform: unspecified   
OS: Linux   
Latest Commit: Version Fixed/Implemented In:
Sentry Crash Report:

Description Pasi Saarinen 2006-08-10 21:45:45 UTC 
Version:           1.4.1 (using KDE KDE 3.5.4)
Installed from:    Unlisted Binary Package
OS:                Linux

I have bound a button to mute with on my keyboard.
I press it once and it mutes, then if i increase the volume and press the mute button again it changes to the volume it had before muting the first time and not to zero.
Comment 1 Martin Aumueller 2006-08-11 01:15:30 UTC 
SVN commit 571869 by aumuell:

probably unmute volume correctly when increasing it while muted
BUG: 132228


 M  +2 -0      ChangeLog  
 M  +4 -1      src/enginecontroller.cpp  


--- trunk/extragear/multimedia/amarok/ChangeLog #571868:571869
@@ -79,6 +79,8 @@
       since the last time it was enabled.
 
   BUGFIXES:
+    * Increasing or decreasing volume while muted would not correctly unmute.
+      (BR 132228)
     * Better resize behavior in iPod collection view mode. Patch by Joe Rabinoff
       <bobqwatson@yahoo.com> (BR 132016)
     * Make sure a track's compilation status is returned properly when running
--- trunk/extragear/multimedia/amarok/src/enginecontroller.cpp #571868:571869
@@ -571,6 +571,8 @@
 
 int EngineController::setVolume( int percent ) //SLOT
 {
+    m_muteVolume = 0;
+
     if( percent < 0 ) percent = 0;
     if( percent > 100 ) percent = 100;
 
@@ -596,8 +598,9 @@
 {
     if( m_muteVolume == 0 )
     {
-        m_muteVolume = m_engine->volume();
+        int saveVolume = m_engine->volume();
         setVolume( 0 );
+        m_muteVolume = saveVolume;
     }
     else
     {