From 3e25a9cd1a9bc837bf2de0ac2d839aa8ffd84d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 24 Oct 2025 12:51:11 +0200 Subject: [PATCH 1/4] audio-devices: Fix ringtone loopback name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's make it match https://gitlab.freedesktop.org/xdg/xdg-specs/-/issues/202 Signed-off-by: Guido Günther Part-of: --- src/ms-audio-devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ms-audio-devices.c b/src/ms-audio-devices.c index 535d1d2d..87f09cb2 100644 --- a/src/ms-audio-devices.c +++ b/src/ms-audio-devices.c @@ -178,7 +178,7 @@ on_device_added (MsAudioDevices *self, guint id) description = g_strdup (_("Media Volume")); } else if (g_str_equal (name, "input.loopback.sink.role.notification")) { description = g_strdup (_("Notification Volume")); - } else if (g_str_equal (name, "input.loopback.sink.role.ringing")) { + } else if (g_str_equal (name, "input.loopback.sink.role.ringtone")) { description = g_strdup (_("Ring Tone Volume")); } else if (g_str_equal (name, "input.loopback.sink.role.call")) { description = g_strdup (_("Call volume")); -- GitLab From 54a5358879e7c498e1ee9d40ddbec391f6281af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 24 Oct 2025 14:37:49 +0200 Subject: [PATCH 2/4] audio-device-row: Get volume only once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- src/ms-audio-device-row.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ms-audio-device-row.c b/src/ms-audio-device-row.c index 7a27dcbb..1e212730 100644 --- a/src/ms-audio-device-row.c +++ b/src/ms-audio-device-row.c @@ -90,6 +90,7 @@ static void on_stream_volume_changed (MsAudioDeviceRow *self) { GvcMixerStream *stream; + pa_volume_t vol; if (self->setting_volume) return; @@ -97,9 +98,10 @@ on_stream_volume_changed (MsAudioDeviceRow *self) stream = ms_audio_device_get_stream (self->audio_device); g_return_if_fail (stream); + vol = gvc_mixer_stream_get_volume (stream); self->setting_volume = TRUE; - g_debug ("Adjusting volume to %d", gvc_mixer_stream_get_volume (stream)); - gtk_adjustment_set_value (self->adjustment, gvc_mixer_stream_get_volume (stream)); + g_debug ("Adjusting volume to %d", vol); + gtk_adjustment_set_value (self->adjustment, vol); self->setting_volume = FALSE; } -- GitLab From f7518f31551490757ca0147c1360e30cd26d840c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 26 Oct 2025 08:02:11 +0100 Subject: [PATCH 3/4] audio-devices: Handle phone call volume MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- data/icons/phone-ongoing-call-symbolic.svg | 2 ++ src/mobile-settings.gresource.xml | 1 + src/ms-audio-devices.c | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 data/icons/phone-ongoing-call-symbolic.svg diff --git a/data/icons/phone-ongoing-call-symbolic.svg b/data/icons/phone-ongoing-call-symbolic.svg new file mode 100644 index 00000000..1a6d2454 --- /dev/null +++ b/data/icons/phone-ongoing-call-symbolic.svg @@ -0,0 +1,2 @@ + + diff --git a/src/mobile-settings.gresource.xml b/src/mobile-settings.gresource.xml index 5d79d0e9..91eb3a05 100644 --- a/src/mobile-settings.gresource.xml +++ b/src/mobile-settings.gresource.xml @@ -35,6 +35,7 @@ ../data/icons/hicolor/scalable/apps/mobi.phosh.MobileSettings.svg ../data/icons/conf-tweaks-symbolic.svg ../data/icons/padlock-symbolic.svg + ../data/icons/phone-ongoing-call-symbolic.svg ../data/icons/phone-docked-symbolic.svg ../data/icons/phonelink2-symbolic.svg diff --git a/src/ms-audio-devices.c b/src/ms-audio-devices.c index 87f09cb2..582cb43e 100644 --- a/src/ms-audio-devices.c +++ b/src/ms-audio-devices.c @@ -178,6 +178,8 @@ on_device_added (MsAudioDevices *self, guint id) description = g_strdup (_("Media Volume")); } else if (g_str_equal (name, "input.loopback.sink.role.notification")) { description = g_strdup (_("Notification Volume")); + } else if (g_str_equal (name, "input.loopback.sink.role.phone")) { + description = g_strdup (_("Voice Call Volume")); } else if (g_str_equal (name, "input.loopback.sink.role.ringtone")) { description = g_strdup (_("Ring Tone Volume")); } else if (g_str_equal (name, "input.loopback.sink.role.call")) { -- GitLab From 3b408aaf2acd705afc3d1f7b70418533d09212c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sun, 26 Oct 2025 08:22:18 +0100 Subject: [PATCH 4/4] audio-device-row: Drop fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we might fallback to incorrect icons for the volume streams. Signed-off-by: Guido Günther Part-of: --- src/ms-audio-device-row.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ms-audio-device-row.c b/src/ms-audio-device-row.c index 1e212730..9a7ea6b3 100644 --- a/src/ms-audio-device-row.c +++ b/src/ms-audio-device-row.c @@ -79,7 +79,7 @@ transform_icon_name_to_icon (GBinding *binding, if (icon_name == NULL) icon_name = "audio-speakers-symbolic"; - icon = g_themed_icon_new_with_default_fallbacks (icon_name); + icon = g_themed_icon_new (icon_name); g_value_take_object (to_value, icon); return TRUE; -- GitLab