mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink: add a virtual_volume to sink

Browse source
This commit is contained in:
Marc-André Lureau 2008-11-10 16:59:09 +02:00
parent 20edd846d0
commit 6ec0162686
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/pulsecore/sink.c
View file

@ -192,6 +192,8 @@ pa_sink* pa_sink_new(
s->volume = data->volume; s->volume = data->volume;
s->base_volume = PA_VOLUME_NORM; s->base_volume = PA_VOLUME_NORM;
s->virtual_volume = s->volume;
s->muted = data->muted; s->muted = data->muted;
s->refresh_volume = s->refresh_muted = FALSE; s->refresh_volume = s->refresh_muted = FALSE;
@ -856,24 +858,26 @@ void pa_sink_set_volume(pa_sink *s, const pa_cvolume *volume) {
pa_assert(pa_cvolume_compatible(volume, &s->sample_spec)); pa_assert(pa_cvolume_compatible(volume, &s->sample_spec));
data.sink = s; data.sink = s;
data.volume = *volume; data.virtual_volume = data.volume = *volume;
changed = !pa_cvolume_equal(&data.volume, &s->volume); changed = !pa_cvolume_equal(&data.virtual_volume, &s->virtual_volume) ||
!pa_cvolume_equal(&data.volume, &s->volume);
if (changed) { if (changed) {
if (pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_SET_VOLUME], &data) < 0) if (pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_SET_VOLUME], &data) < 0)
return; return;
changed = !pa_cvolume_equal(&data.volume, &s->volume); changed = !pa_cvolume_equal(&data.virtual_volume, &s->virtual_volume); /* from client-side view */
} }
s->volume = data.volume; s->volume = data.volume;
s->virtual_volume = data.virtual_volume;
if (s->set_volume && s->set_volume(s) < 0) if (s->set_volume && s->set_volume(s) < 0)
s->set_volume = NULL; s->set_volume = NULL;
if (!s->set_volume) if (!s->set_volume)
pa_sink_set_soft_volume(s, volume); pa_sink_set_soft_volume(s, &s->volume);
if (changed) if (changed)
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
@ -896,19 +900,21 @@ const pa_cvolume *pa_sink_get_volume(pa_sink *s, pa_bool_t force_refresh) {
pa_assert(PA_SINK_IS_LINKED(s->state)); pa_assert(PA_SINK_IS_LINKED(s->state));
if (s->refresh_volume || force_refresh) { if (s->refresh_volume || force_refresh) {
struct pa_cvolume old_volume = s->volume; struct pa_cvolume old_volume = s->virtual_volume;
if (s->get_volume && s->get_volume(s) < 0) if (s->get_volume && s->get_volume(s) < 0)
s->get_volume = NULL; s->get_volume = NULL;
if (!s->get_volume) if (!s->get_volume) {
pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_VOLUME, &s->volume, 0, NULL); pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_VOLUME, &s->volume, 0, NULL);
s->virtual_volume = s->volume;
}
if (!pa_cvolume_equal(&old_volume, &s->volume)) if (!pa_cvolume_equal(&old_volume, &s->virtual_volume))
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index); pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, s->index);
} }
return &s->volume; return &s->virtual_volume;
} }
/* Called from main thread */ /* Called from main thread */

2
src/pulsecore/sink.h
View file

@ -79,6 +79,7 @@ struct pa_sink {
pa_source *monitor_source; pa_source *monitor_source;
pa_cvolume volume; pa_cvolume volume;
pa_cvolume virtual_volume;
pa_bool_t muted; pa_bool_t muted;
pa_volume_t base_volume; /* shall be constant */ pa_volume_t base_volume; /* shall be constant */
@ -211,6 +212,7 @@ void pa_sink_new_data_done(pa_sink_new_data *data);
typedef struct pa_sink_set_volume_data { typedef struct pa_sink_set_volume_data {
pa_sink *sink; pa_sink *sink;
pa_cvolume volume; pa_cvolume volume;
pa_cvolume virtual_volume;
} pa_sink_set_volume_data; } pa_sink_set_volume_data;
/* To be called exclusively by the sink driver, from main context */ /* To be called exclusively by the sink driver, from main context */