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

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia/kmix
From:       Helio Chissini de Castro <helio () conectiva ! com ! br>
Date:       2006-09-06 18:51:11
Message-ID: 1157568671.533607.2196.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 581568 by helio:

- Fixed Mandriva bug http://qa.mandriva.com/show_bug.cgi?id=21221, wich applies
  to upstream KDE: Global shortcuts should follow master channel change.


 M  +9 -21     kmix.cpp  


--- branches/KDE/3.5/kdemultimedia/kmix/kmix.cpp #581567:581568
@@ -606,37 +606,25 @@
 void
 KMixWindow::toggleMuted()
 {
-   Mixer* mixerMaster = Mixer::masterCard();
-   if ( mixerMaster != 0 ) {
-      MixDevice* md = mixerMaster->masterDevice();
-      if ( md != 0 && md->hasMute() ) {
-         mixerMaster->toggleMute(md->num());
-      }
-   }
+   MixDevice* md = Mixer::masterCardDevice();
+   if ( md != 0 && md->hasMute() ) 
+      Mixer::masterCard()->toggleMute(md->num());
 }
 
 void
 KMixWindow::increaseVolume()
 {
-   Mixer* mixerMaster = Mixer::masterCard();
-   if ( mixerMaster != 0 ) {
-      MixDevice* md = mixerMaster->masterDevice();
-      if ( md != 0 ) {
-         mixerMaster->increaseVolume(md->num());
-      }
-   }
+   MixDevice* md = Mixer::masterCardDevice();
+   if ( md != 0 ) 
+      Mixer::masterCard()->increaseVolume(md->num());
 }
 
 void
 KMixWindow::decreaseVolume()
 {
-   Mixer* mixerMaster = Mixer::masterCard();
-   if ( mixerMaster != 0 ) {
-      MixDevice* md = mixerMaster->masterDevice();
-      if ( md != 0 ) {
-         mixerMaster->decreaseVolume(md->num());
-      }
-   }
+   MixDevice* md = Mixer::masterCardDevice();
+   if ( md != 0 )
+      Mixer::masterCard()->decreaseVolume(md->num());
 }
 
 #include "kmix.moc"
[prev in list] [next in list] [prev in thread] [next in thread]