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

fix muting for sink inputs

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1663 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-15 19:26:38 +00:00
parent 3d9299029c
commit a74e804973
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pulsecore/sink-input.c
View file

@ -398,7 +398,11 @@ int pa_sink_input_peek(pa_sink_input *i, pa_memchunk *chunk, pa_cvolume *volume)
/* It might be necessary to adjust the volume here */ /* It might be necessary to adjust the volume here */
if (do_volume_adj_here && !volume_is_norm) { if (do_volume_adj_here && !volume_is_norm) {
pa_memchunk_make_writable(&tchunk, 0); pa_memchunk_make_writable(&tchunk, 0);
pa_volume_memchunk(&tchunk, &i->thread_info.sample_spec, &i->thread_info.volume);
if (i->thread_info.muted)
pa_silence_memchunk(&tchunk, &i->thread_info.sample_spec);
else
pa_volume_memchunk(&tchunk, &i->thread_info.sample_spec, &i->thread_info.volume);
} }
pa_resampler_run(i->thread_info.resampler, &tchunk, &i->thread_info.resampled_chunk); pa_resampler_run(i->thread_info.resampler, &tchunk, &i->thread_info.resampled_chunk);
@ -430,8 +434,10 @@ finish:
if (do_volume_adj_here) if (do_volume_adj_here)
/* We had different channel maps, so we already did the adjustment */ /* We had different channel maps, so we already did the adjustment */
pa_cvolume_reset(volume, i->sink->sample_spec.channels); pa_cvolume_reset(volume, i->sink->sample_spec.channels);
else else if (i->thread_info.muted)
/* We've both the same channel map, so let's have the sink do the adjustment for us*/ /* We've both the same channel map, so let's have the sink do the adjustment for us*/
pa_cvolume_mute(volume, i->sink->sample_spec.channels);
else
*volume = i->thread_info.volume; *volume = i->thread_info.volume;
} }