summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2020-03-28 16:38:37 +0100
committerBenjamin Berg <bberg@redhat.com>2020-03-28 16:38:37 +0100
commit76afcdbbca87d42e035b90e42593ab846061403f (patch)
treee51520ad179d02125a21dde554872d0e9010ef2c
parent7485182bae71d645962a5151d3852cbe49725c08 (diff)
downloadgnome-settings-daemon-benzea/revert-volume-notification.tar.gz
media-keys: Do not suppress volume-change while playingbenzea/revert-volume-notification
This effectively reverts commit 7d74327dc2 ("media-keys: Skip volume-change feedback while playing"). The main problem is that we get into our own way when the volume-change happens multiple times in quick succession. The feature is nice, but we need to improve it so that playback is only supressed when a proper audio stream is playing rather than just system sounds. Resolves: #508
-rw-r--r--plugins/media-keys/gsd-media-keys-manager.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 7d3cdf54..7b50e92b 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1400,7 +1400,6 @@ show_volume_osd (GsdMediaKeysManager *manager,
GvcMixerUIDevice *device;
const GvcMixerStreamPort *port;
const char *icon;
- gboolean playing;
double new_vol;
double max_volume;
@@ -1425,9 +1424,7 @@ show_volume_osd (GsdMediaKeysManager *manager,
show_osd_with_max_level (manager, icon, NULL, new_vol, max_volume, NULL);
}
- playing = gvc_mixer_stream_get_state (stream) == GVC_STREAM_STATE_RUNNING;
-
- if (quiet == FALSE && sound_changed != FALSE && muted == FALSE && playing == FALSE)
+ if (quiet == FALSE && sound_changed != FALSE && muted == FALSE)
play_volume_changed_audio (manager, stream);
}