aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm_mix.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-07 18:08:26 +0100
committerMax Kellermann <max@duempel.org>2009-01-07 18:08:26 +0100
commit6768581c41fd7646d057ff1594f770ce3075065a (patch)
tree7804b4d2cfd7d049757c91234a8f19a16987a727 /src/pcm_mix.c
parentb7b5e3f9c30a9ed898cddb1b5e4b471750824600 (diff)
downloadmpd-6768581c41fd7646d057ff1594f770ce3075065a.tar.gz
mpd-6768581c41fd7646d057ff1594f770ce3075065a.tar.xz
mpd-6768581c41fd7646d057ff1594f770ce3075065a.zip
pcm_volume: rename pcm_dither() to pcm_volume_dither()
Diffstat (limited to '')
-rw-r--r--src/pcm_mix.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pcm_mix.c b/src/pcm_mix.c
index 208805831..0ca5a9a7f 100644
--- a/src/pcm_mix.c
+++ b/src/pcm_mix.c
@@ -37,7 +37,8 @@ pcm_add_8(int8_t *buffer1, const int8_t *buffer2,
int32_t sample2 = *buffer2++;
sample1 = ((sample1 * volume1 + sample2 * volume2) +
- pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
+ pcm_volume_dither() + PCM_VOLUME_1 / 2)
+ / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 8);
--num_samples;
@@ -53,7 +54,8 @@ pcm_add_16(int16_t *buffer1, const int16_t *buffer2,
int32_t sample2 = *buffer2++;
sample1 = ((sample1 * volume1 + sample2 * volume2) +
- pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
+ pcm_volume_dither() + PCM_VOLUME_1 / 2)
+ / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 16);
--num_samples;
@@ -69,7 +71,8 @@ pcm_add_24(int32_t *buffer1, const int32_t *buffer2,
int64_t sample2 = *buffer2++;
sample1 = ((sample1 * volume1 + sample2 * volume2) +
- pcm_dither() + PCM_VOLUME_1 / 2) / PCM_VOLUME_1;
+ pcm_volume_dither() + PCM_VOLUME_1 / 2)
+ / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 24);
--num_samples;