summaryrefslogtreecommitdiffstats
path: root/kmix/mixer.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-05-17 01:22:02 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-05-25 13:37:28 +0900
commit9859df0541de6016cacea2032d5fe75e98b53a0b (patch)
tree4129344a63afb6eb9809f1bb6262748229b9bf8a /kmix/mixer.cpp
parent86691144d6ce506dfcb5016dbffda4da3db256fc (diff)
downloadtdemultimedia-9859df0541de6016cacea2032d5fe75e98b53a0b.tar.gz
tdemultimedia-9859df0541de6016cacea2032d5fe75e98b53a0b.zip
KMix: fixed update of tray volume icon when muting/unmuting the selected
channel. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 244f76de8db33b6d659c91ca9424d8556f2f20eb)
Diffstat (limited to 'kmix/mixer.cpp')
-rw-r--r--kmix/mixer.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index ba3bfee8..2b48f512 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -372,7 +372,7 @@ TQString& Mixer::id()
return _id;
}
-void Mixer::setMasterCard(TQString& ref_id)
+void Mixer::setMasterCard(const TQString& ref_id)
{
// The value is taken over without checking on existance. This allows the User to define
// a MasterCard that is not always available (e.g. it is an USB hotplugging device).
@@ -703,7 +703,12 @@ void Mixer::toggleMute( int deviceidx )
mixdev->setMuted( !previousState );
- _mixerBackend->writeVolumeToHW(deviceidx, mixdev->getVolume() );
+ _mixerBackend->writeVolumeToHW(deviceidx, mixdev->getVolume());
+
+ // Muting/unmuting PulseAudio directly does not send back any notification to the mixer
+ // so we make sure we always update the tray icon after each operation.
+ readSetFromHWforceUpdate();
+ TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
}
// @dcop only