mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

source-output: Ensure no volumes are applied for passthrough streams

Browse source 
This forces passthrough source-outputs and their corresponding sources
to 0dB gain so that the data is sent unaltered to the receiver.
This commit is contained in:
Arun Raghavan 2011-08-18 12:32:14 +05:30
parent 0dea35a818
commit f0be9c4004
3 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/pulsecore/source-output.c
View file

@ -298,10 +298,13 @@ int pa_source_output_new(
pa_return_val_if_fail(pa_channel_map_compatible(&data->channel_map, &data->sample_spec), -PA_ERR_INVALID);
/* Don't restore (or save) stream volume for passthrough streams */
/* Don't restore (or save) stream volume for passthrough streams and
* prevent attenuation/gain */
if (pa_source_output_new_data_is_passthrough(data)) {
data->volume_is_set = FALSE;
data->volume_factor_is_set = FALSE;
data->volume_is_set = TRUE;
pa_cvolume_reset(&data->volume, data->sample_spec.channels);
data->volume_is_absolute = TRUE;
data->save_volume = FALSE;
}
if (!data->volume_is_set) {
@ -544,6 +547,9 @@ void pa_source_output_unlink(pa_source_output*o) {
o->state = PA_SOURCE_OUTPUT_UNLINKED;
if (linked && o->source) {
if (pa_source_output_is_passthrough(o))
pa_source_leave_passthrough(o->source);
/* We might need to update the source's volume if we are in flat volume mode. */
if (pa_source_flat_volume_enabled(o->source))
pa_source_set_volume(o->source, NULL, FALSE, FALSE);
@ -628,6 +634,9 @@ void pa_source_output_put(pa_source_output *o) {
set_real_ratio(o, &o->volume);
}
if (pa_source_output_is_passthrough(o))
pa_source_enter_passthrough(o->source);
o->thread_info.soft_volume = o->soft_volume;
o->thread_info.muted = o->muted;
@ -1180,6 +1189,9 @@ int pa_source_output_start_move(pa_source_output *o) {
if (pa_source_output_get_state(o) == PA_SOURCE_OUTPUT_CORKED)
pa_assert_se(origin->n_corked-- >= 1);
if (pa_source_output_is_passthrough(o))
pa_source_leave_passthrough(o->source);
if (pa_source_flat_volume_enabled(o->source))
/* We might need to update the source's volume if we are in flat
* volume mode. */
@ -1434,6 +1446,9 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
update_volume_due_to_moving(o, dest);
if (pa_source_output_is_passthrough(o))
pa_source_enter_passthrough(o->source);
pa_assert_se(pa_asyncmsgq_send(o->source->asyncmsgq, PA_MSGOBJECT(o->source), PA_SOURCE_MESSAGE_ADD_OUTPUT, o, 0, NULL) == 0);
pa_log_debug("Successfully moved source output %i to %s.", o->index, dest->name);