diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-08-15 19:26:38 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-08-15 19:26:38 +0000 |
commit | a74e804973eff2c6d9dff34fe415df9a0bb40683 (patch) | |
tree | c0f1301438fe626fb8872efc741ab3a17de7e53a | |
parent | 3d9299029c89d1bdc23c5e39bf627b0f4d7f2f3c (diff) |
fix muting for sink inputs
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1663 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/pulsecore/sink-input.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 5fd1da47..8bec5d5d 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -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 */ if (do_volume_adj_here && !volume_is_norm) { 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); @@ -430,8 +434,10 @@ finish: if (do_volume_adj_here) /* We had different channel maps, so we already did the adjustment */ 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*/ + pa_cvolume_mute(volume, i->sink->sample_spec.channels); + else *volume = i->thread_info.volume; } |