summaryrefslogtreecommitdiff
path: root/src/decoder
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-07-07 14:40:02 +0200
committerMax Kellermann <max@musicpd.org>2018-07-07 14:40:02 +0200
commitd7f770ce7334e647fd4d156f50ca9d4ba18eb647 (patch)
tree78d6110e640406038a3314f3bcb660d47546926d /src/decoder
parente1ddb630543a74fb8216b7b405df1a03b247c7bb (diff)
decoder/flac: move flac_sample_format() to FlacAudioFormat.hxx
Diffstat (limited to 'src/decoder')
-rw-r--r--src/decoder/plugins/FlacPcm.cxx24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/decoder/plugins/FlacPcm.cxx b/src/decoder/plugins/FlacPcm.cxx
index f52c42b31..b6c988da4 100644
--- a/src/decoder/plugins/FlacPcm.cxx
+++ b/src/decoder/plugins/FlacPcm.cxx
@@ -20,37 +20,17 @@
#include "config.h"
#include "FlacPcm.hxx"
#include "CheckAudioFormat.hxx"
+#include "lib/xiph/FlacAudioFormat.hxx"
#include "util/RuntimeError.hxx"
#include "util/ConstBuffer.hxx"
#include <assert.h>
-static SampleFormat
-flac_sample_format(unsigned bits_per_sample)
-{
- switch (bits_per_sample) {
- case 8:
- return SampleFormat::S8;
-
- case 16:
- return SampleFormat::S16;
-
- case 24:
- return SampleFormat::S24_P32;
-
- case 32:
- return SampleFormat::S32;
-
- default:
- return SampleFormat::UNDEFINED;
- }
-}
-
void
FlacPcmImport::Open(unsigned sample_rate, unsigned bits_per_sample,
unsigned channels)
{
- auto sample_format = flac_sample_format(bits_per_sample);
+ auto sample_format = FlacSampleFormat(bits_per_sample);
if (sample_format == SampleFormat::UNDEFINED)
throw FormatRuntimeError("Unsupported FLAC bit depth: %u",
bits_per_sample);