diff options
Diffstat (limited to 'src/pulsecore/source-output.c')
| -rw-r--r-- | src/pulsecore/source-output.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index bcef51fdb..e4ed43804 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -306,7 +306,7 @@ int pa_source_output_new( /* Routing is done. We have a source and a format. */ - if (data->volume_is_set && pa_format_info_is_pcm(data->format)) { + if (data->volume_is_set && !pa_source_output_new_data_is_passthrough(data)) { /* If volume is set, we need to save the original data->channel_map, * so that we can remap the volume from the original channel map to the * final channel map of the stream in case data->channel_map gets @@ -314,6 +314,10 @@ int pa_source_output_new( r = pa_stream_get_volume_channel_map(&data->volume, data->channel_map_is_set ? &data->channel_map : NULL, data->format, &volume_map); if (r < 0) return r; + } else { + /* Initialize volume_map to invalid state. We check the state later to + * determine if volume remapping is needed. */ + pa_channel_map_init(&volume_map); } /* Now populate the sample spec and channel map according to the final @@ -341,7 +345,7 @@ int pa_source_output_new( if (!data->volume_writable) data->save_volume = false; - if (data->volume_is_set) + if (pa_channel_map_valid(&volume_map)) /* The original volume channel map may be different than the final * stream channel map, so remapping may be needed. */ pa_cvolume_remap(&data->volume, &volume_map, &data->channel_map); |