diff options
author | Pierre Ossman <ossman@cendio.se> | 2006-03-08 13:00:46 +0000 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2006-03-08 13:00:46 +0000 |
commit | 3ef49701428a4ddd135e173ea9beeb6d3931f876 (patch) | |
tree | 80ffc3ba75ac2d8c252d23a86aa3716de635afb2 /src/polypcore/sink-input.c | |
parent | 528d15095dd27d401be5d138d144a9df8ba7803a (diff) |
We filled the volume with the wrong channel count (we used the input, not
the output) causing static. Also swapped the comments since they were
misplaced.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@636 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/polypcore/sink-input.c')
-rw-r--r-- | src/polypcore/sink-input.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/polypcore/sink-input.c b/src/polypcore/sink-input.c index f12a85e1..e1703b97 100644 --- a/src/polypcore/sink-input.c +++ b/src/polypcore/sink-input.c @@ -262,11 +262,10 @@ finish: * ourselves, or if this can be done by the sink for us */ if (do_volume_adj_here) - /* We've both the same channel map, so let's have the sink do the adjustment for us*/ - - pa_cvolume_reset(volume, i->sample_spec.channels); - else /* We had different channel maps, so we already did the adjustment */ + pa_cvolume_reset(volume, i->sink->sample_spec.channels); + else + /* We've both the same channel map, so let's have the sink do the adjustment for us*/ *volume = i->volume; } |