mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-raop-sink: don't let mute change the volume

Browse source 
Use both the volume and mute to decide what volume to send.

Don't let the mute state overwrite the volume. Also never mute the
stream.

Pressing mute and unmute restores the previous volume this way.
This commit is contained in:
Wim Taymans 2023-10-03 12:59:17 +02:00
parent c5cc364794
commit d8c73ebede
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-raop-sink.c
View file

@ -981,7 +981,7 @@ static int rtsp_send_volume(struct impl *impl)
char header[128], volstr[64]; char header[128], volstr[64];
snprintf(header, sizeof(header), "volume: %s\r\n", snprintf(header, sizeof(header), "volume: %s\r\n",
spa_dtoa(volstr, sizeof(volstr), impl->volume)); spa_dtoa(volstr, sizeof(volstr), impl->mute ? VOLUME_MUTE : impl->volume));
return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, rtsp_log_reply_status); return rtsp_send(impl, "SET_PARAMETER", "text/parameters", header, rtsp_log_reply_status);
} }
@ -1723,14 +1723,13 @@ static void stream_props_changed(struct impl *impl, uint32_t id, const struct sp
{ {
bool mute; bool mute;
if (spa_pod_get_bool(&prop->value, &mute) == 0) { if (spa_pod_get_bool(&prop->value, &mute) == 0) {
if (!impl->mute) { if (!impl->mute != mute) {
impl->volume = VOLUME_MUTE; impl->mute = mute;
rtsp_send_volume(impl); rtsp_send_volume(impl);
} }
impl->mute = mute;
} }
spa_pod_builder_prop(&b, SPA_PROP_softMute, 0); spa_pod_builder_prop(&b, SPA_PROP_softMute, 0);
spa_pod_builder_bool(&b, impl->mute); spa_pod_builder_bool(&b, false);
spa_pod_builder_raw_padded(&b, prop, SPA_POD_PROP_SIZE(prop)); spa_pod_builder_raw_padded(&b, prop, SPA_POD_PROP_SIZE(prop));
break; break;
} }