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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix/gui
From:       Christian Esken <esken () kde ! org>
Date:       2012-02-28 0:02:07
Message-ID: 20120228000207.42101AC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1282607 by esken:

Fix slider in Tray Popup to follow volume changes again (trunk)
Fix mute state for WheelEvent in DockIcon
BUGS: 290863
BUGS: 294626

 M  +2 -1      kmixdockwidget.cpp  


--- trunk/KDE/kdemultimedia/kmix/gui/kmixdockwidget.cpp #1282606:1282607
@@ -102,6 +102,7 @@
         _volWA->setDefaultWidget(_referenceWidget2);
         _referenceWidget->addAction(_volWA);
 
+        connect( m_mixer, SIGNAL(controlChanged()), _referenceWidget2, \
SLOT(refreshVolumeLevels()) );  //setAssociatedWidget(_referenceWidget);
         //setAssociatedWidget(_referenceWidget);  // If you use the popup, associate \
that instead of the MainWindow  
@@ -389,7 +390,7 @@
 
     long int cv = inc * (delta / 120 );
 //    kDebug() << "twe: " << cv << " : " << vol;
-    bool isInactive =  vol.isCapture() ? md->isMuted() : !md->isRecSource();
+    bool isInactive =  vol.isCapture() ? !md->isRecSource() : md->isMuted();
     kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << \
isInactive;  if ( cv > 0 && isInactive)
 	{   // increasing from muted state: unmute and start with a low volume level


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