summaryrefslogtreecommitdiff
path: root/plugins/media-keys
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2014-08-21 01:28:05 +0200
committerinfirit <[email protected]>2014-10-09 16:51:29 +0200
commitbe56b0f8f8ef77296fe12c73985785874dc896c2 (patch)
tree78181de96e6728f627443c2db982d30baf52e6be /plugins/media-keys
parenteb996b39801092f4548497aba20e88400f4a9ae0 (diff)
downloadmate-settings-daemon-be56b0f8f8ef77296fe12c73985785874dc896c2.tar.bz2
mate-settings-daemon-be56b0f8f8ef77296fe12c73985785874dc896c2.tar.xz
Unmute when lowering volume and the target volume is higher than minimal
Diffstat (limited to 'plugins/media-keys')
-rw-r--r--plugins/media-keys/msd-media-keys-manager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
index d7033ff..1ff0291 100644
--- a/plugins/media-keys/msd-media-keys-manager.c
+++ b/plugins/media-keys/msd-media-keys-manager.c
@@ -653,7 +653,7 @@ do_sound_action (MsdMediaKeysManager *manager, int type)
volume_step > 100)
volume_step = VOLUME_STEP;
- /* Scale the volume step size accordingly to the range used by the stream */
+ /* Scale the volume step size accordingly to the range used by the control */
volume_step = (volume_max - volume_min) * volume_step / 100;
volume = volume_last =
@@ -666,12 +666,12 @@ do_sound_action (MsdMediaKeysManager *manager, int type)
muted = !muted;
break;
case VOLUME_DOWN_KEY:
- if (!muted) {
- if (volume <= (volume_min + volume_step)) {
- volume = volume_min;
- muted = TRUE;
- } else
- volume -= volume_step;
+ if (volume <= (volume_min + volume_step)) {
+ volume = volume_min;
+ muted = TRUE;
+ } else {
+ volume -= volume_step;
+ muted = FALSE;
}
break;
case VOLUME_UP_KEY: