Improve macro check for ogg decoder

The OGG decoder needs libogg and (tremor or libvorbis).
This commit is contained in:
Jörg Krause 2017-03-14 18:07:48 +01:00 committed by badaix
parent 0489221d7f
commit c4e38b60b0
2 changed files with 18 additions and 18 deletions

View file

@ -20,7 +20,7 @@
#include <string>
#include <memory>
#include "controller.h"
#if defined(HAS_OGG) || defined(HAS_TREMOR)
#if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS))
#include "decoder/oggDecoder.h"
#endif
#include "decoder/pcmDecoder.h"
@ -106,7 +106,7 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
if (headerChunk_->codec == "pcm")
decoder_.reset(new PcmDecoder());
#if defined(HAS_OGG) || defined(HAS_TREMOR)
#if defined(HAS_OGG) && (defined(HAS_TREMOR) || defined(HAS_VORBIS))
else if (headerChunk_->codec == "ogg")
decoder_.reset(new OggDecoder());
#endif