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

decoder/plugins/PcmDecoderPlugin: guard alsa specific code with pre-processor macro test

Browse Source
This commit is contained in:
borine 2019-03-07 08:26:04 +00:00
parent 5d18559c1c
commit 0762e5c289
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/decoder/plugins/PcmDecoderPlugin.cxx
View File

@ -28,9 +28,12 @@
#include "util/StaticFifoBuffer.hxx" #include "util/StaticFifoBuffer.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/MimeType.hxx" #include "util/MimeType.hxx"
#include "AudioParser.hxx"
#include "Log.hxx" #include "Log.hxx"
#ifdef ENABLE_ALSA
#include "AudioParser.hxx"
#endif
#include <exception> #include <exception>
#include <assert.h> #include <assert.h>
@ -135,6 +138,7 @@ pcm_stream_decode(DecoderClient &client, InputStream &is)
audio_format.channels = value; audio_format.channels = value;
} }
#ifdef ENABLE_ALSA
if (GetMimeTypeBase(mime) == "audio/x-mpd-alsa-pcm") { if (GetMimeTypeBase(mime) == "audio/x-mpd-alsa-pcm") {
i = mime_parameters.find("format"); i = mime_parameters.find("format");
if (i != mime_parameters.end()) { if (i != mime_parameters.end()) {
@ -148,6 +152,7 @@ pcm_stream_decode(DecoderClient &client, InputStream &is)
} }
} }
} }
#endif
} }
if (audio_format.sample_rate == 0) { if (audio_format.sample_rate == 0) {
@ -236,8 +241,10 @@ static const char *const pcm_mime_types[] = {
/* same as above, but with reverse byte order */ /* same as above, but with reverse byte order */
"audio/x-mpd-cdda-pcm-reverse", "audio/x-mpd-cdda-pcm-reverse",
#ifdef ENABLE_ALSA
/* for streams obtained by the alsa input plugin */ /* for streams obtained by the alsa input plugin */
"audio/x-mpd-alsa-pcm", "audio/x-mpd-alsa-pcm",
#endif
nullptr nullptr
}; };