summaryrefslogtreecommitdiffstats
path: root/kmix/mixer.cpp
diff options
context:
space:
mode:
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 bda80910..46e4e138 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).
@@ -702,7 +702,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