oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/Volume: make PCM_VOLUME_1 a "constexpr"

Browse Source
This commit is contained in:
Max Kellermann 2013-12-22 17:36:21 +01:00
parent 5aae560683
commit bfe020e06c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pcm/PcmMix.cxx
View File

@ -36,8 +36,8 @@ PcmAddVolume(typename Traits::value_type _a, typename Traits::value_type _b,
typename Traits::long_type a(_a), b(_b); typename Traits::long_type a(_a), b(_b);
typename Traits::value_type c = ((a * volume1 + b * volume2) + typename Traits::value_type c = ((a * volume1 + b * volume2) +
pcm_volume_dither() + PCM_VOLUME_1 / 2) pcm_volume_dither() + PCM_VOLUME_1S / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1S;
return PcmClamp<F, Traits>(c); return PcmClamp<F, Traits>(c);
} }
@ -204,7 +204,6 @@ bool
pcm_mix(void *buffer1, const void *buffer2, size_t size, pcm_mix(void *buffer1, const void *buffer2, size_t size,
SampleFormat format, float portion1) SampleFormat format, float portion1)
{ {
int vol1;
float s; float s;
/* portion1 is between 0.0 and 1.0 for crossfading, MixRamp uses -1 /* portion1 is between 0.0 and 1.0 for crossfading, MixRamp uses -1
@ -215,8 +214,8 @@ pcm_mix(void *buffer1, const void *buffer2, size_t size,
s = sin(M_PI_2 * portion1); s = sin(M_PI_2 * portion1);
s *= s; s *= s;
vol1 = s * PCM_VOLUME_1 + 0.5; int vol1 = s * PCM_VOLUME_1S + 0.5;
vol1 = Clamp<int>(vol1, 0, PCM_VOLUME_1); vol1 = Clamp<int>(vol1, 0, PCM_VOLUME_1S);
return pcm_add_vol(buffer1, buffer2, size, vol1, PCM_VOLUME_1 - vol1, format); return pcm_add_vol(buffer1, buffer2, size, vol1, PCM_VOLUME_1S - vol1, format);
} }

6
src/pcm/PcmVolume.cxx
View File

@ -36,8 +36,8 @@ pcm_volume_change(typename Traits::pointer_type buffer,
typename Traits::long_type sample = *buffer; typename Traits::long_type sample = *buffer;
sample = (sample * volume + pcm_volume_dither() + sample = (sample * volume + pcm_volume_dither() +
PCM_VOLUME_1 / 2) PCM_VOLUME_1S / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1S;
*buffer++ = PcmClamp<F, Traits>(sample); *buffer++ = PcmClamp<F, Traits>(sample);
} }
@ -132,7 +132,7 @@ pcm_volume(void *buffer, size_t length,
SampleFormat format, SampleFormat format,
int volume) int volume)
{ {
if (volume == PCM_VOLUME_1) if (volume == PCM_VOLUME_1S)
return true; return true;
if (volume <= 0) { if (volume <= 0) {

9
src/pcm/PcmVolume.hxx
View File

@ -26,10 +26,11 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
enum { /**
/** this value means "100% volume" */ * This value means "100% volume".
PCM_VOLUME_1 = 1024, */
}; static constexpr unsigned PCM_VOLUME_1 = 1024;
static constexpr int PCM_VOLUME_1S = PCM_VOLUME_1;
struct AudioFormat; struct AudioFormat;