diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-03 21:00:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-03 21:37:56 +0200 |
| commit | d1e7b4e38136f9342aad76c685a13adf0e69f869 (patch) | |
| tree | 49643b937ddfe735511b566a71398da5a945d7aa /src/decoder/FlacPcm.cxx | |
| parent | 67f591a9ce60651da41afc499bd9a22e25314e35 (diff) | |
| download | mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.tar.gz mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.tar.xz mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.zip | |
audio_format: convert to C++
Diffstat (limited to 'src/decoder/FlacPcm.cxx')
| -rw-r--r-- | src/decoder/FlacPcm.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/decoder/FlacPcm.cxx b/src/decoder/FlacPcm.cxx index 17a13edda..ff855fa70 100644 --- a/src/decoder/FlacPcm.cxx +++ b/src/decoder/FlacPcm.cxx @@ -76,12 +76,12 @@ flac_convert_8(int8_t *dest, void flac_convert(void *dest, - unsigned int num_channels, enum sample_format sample_format, + unsigned int num_channels, SampleFormat sample_format, const FLAC__int32 *const buf[], unsigned int position, unsigned int end) { switch (sample_format) { - case SAMPLE_FORMAT_S16: + case SampleFormat::S16: if (num_channels == 2) flac_convert_stereo16((int16_t*)dest, buf, position, end); @@ -90,20 +90,20 @@ flac_convert(void *dest, position, end); break; - case SAMPLE_FORMAT_S24_P32: - case SAMPLE_FORMAT_S32: + case SampleFormat::S24_P32: + case SampleFormat::S32: flac_convert_32((int32_t*)dest, num_channels, buf, position, end); break; - case SAMPLE_FORMAT_S8: + case SampleFormat::S8: flac_convert_8((int8_t*)dest, num_channels, buf, position, end); break; - case SAMPLE_FORMAT_FLOAT: - case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_UNDEFINED: + case SampleFormat::FLOAT: + case SampleFormat::DSD: + case SampleFormat::UNDEFINED: assert(false); gcc_unreachable(); } |