mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: emit volume/mute changes on change

Browse source
This commit is contained in:
Wim Taymans 2020-07-08 17:24:23 +02:00
parent bf9b58e1f5
commit ee59bcd632
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/alsa/acp/acp.c
View file

@ -1357,10 +1357,13 @@ int acp_device_set_volume(struct acp_device *dev, const float *volume, uint32_t
pa_alsa_device *d = (pa_alsa_device*)dev; pa_alsa_device *d = (pa_alsa_device*)dev;
pa_card *impl = d->card; pa_card *impl = d->card;
uint32_t i; uint32_t i;
pa_cvolume v; pa_cvolume v, old_volume;
if (n_volume == 0) if (n_volume == 0)
return -EINVAL; return -EINVAL;
old_volume = d->real_volume;
v.channels = d->mapping->channel_map.channels; v.channels = d->mapping->channel_map.channels;
for (i = 0; i < v.channels; i++) for (i = 0; i < v.channels; i++)
v.values[i] = volume[i % n_volume] * PA_VOLUME_NORM; v.values[i] = volume[i % n_volume] * PA_VOLUME_NORM;
@ -1376,6 +1379,9 @@ int acp_device_set_volume(struct acp_device *dev, const float *volume, uint32_t
if (impl->events && impl->events->set_soft_volume) if (impl->events && impl->events->set_soft_volume)
impl->events->set_soft_volume(impl->user_data, dev, volume, n_volume); impl->events->set_soft_volume(impl->user_data, dev, volume, n_volume);
} }
if (!pa_cvolume_equal(&d->real_volume, &old_volume))
if (impl->events && impl->events->volume_changed)
impl->events->volume_changed(impl->user_data, dev);
return 0; return 0;
} }
@ -1396,7 +1402,9 @@ int acp_device_set_mute(struct acp_device *dev, bool mute)
{ {
pa_alsa_device *d = (pa_alsa_device*)dev; pa_alsa_device *d = (pa_alsa_device*)dev;
pa_card *impl = d->card; pa_card *impl = d->card;
if (d->muted == mute) bool old_muted = d->muted;
if (old_muted == mute)
return 0; return 0;
pa_log_info("Set %s mute: %d", d->set_mute ? "hardware" : "software", mute); pa_log_info("Set %s mute: %d", d->set_mute ? "hardware" : "software", mute);
@ -1408,6 +1416,10 @@ int acp_device_set_mute(struct acp_device *dev, bool mute)
if (impl->events && impl->events->set_soft_mute) if (impl->events && impl->events->set_soft_mute)
impl->events->set_soft_mute(impl->user_data, dev, mute); impl->events->set_soft_mute(impl->user_data, dev, mute);
} }
if (old_muted != mute)
if (impl->events && impl->events->mute_changed)
impl->events->mute_changed(impl->user_data, dev);
return 0; return 0;
} }