3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-23 14:06:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix HAS_VORBIS_ENC define

Browse source
This commit is contained in:
badaix 2019-11-21 22:23:34 +01:00
parent bba4d4a5ef
commit 810c65773c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -170,7 +170,7 @@ endif()
if(BUILD_WITH_VORBIS) if(BUILD_WITH_VORBIS)
pkg_search_module(VORBISENC vorbisenc) pkg_search_module(VORBISENC vorbisenc)
if (VORBISENC_FOUND) if (VORBISENC_FOUND)
add_definitions("-DHAS_VORBISENC") add_definitions("-DHAS_VORBIS_ENC")
endif(VORBISENC_FOUND) endif(VORBISENC_FOUND)
endif() endif()

4
server/encoder/encoder_factory.cpp
View file

@ -18,7 +18,7 @@
#include "encoder_factory.hpp" #include "encoder_factory.hpp"
#include "pcm_encoder.hpp" #include "pcm_encoder.hpp"
#if defined(HAS_OGG) && defined(HAS_VORBIS) && defined(HAS_VORBISENC) #if defined(HAS_OGG) && defined(HAS_VORBIS) && defined(HAS_VORBIS_ENC)
#include "ogg_encoder.hpp" #include "ogg_encoder.hpp"
#endif #endif
#if defined(HAS_FLAC) #if defined(HAS_FLAC)
@ -49,7 +49,7 @@ Encoder* EncoderFactory::createEncoder(const std::string& codecSettings) const
} }
if (codec == "pcm") if (codec == "pcm")
encoder = new PcmEncoder(codecOptions); encoder = new PcmEncoder(codecOptions);
#if defined(HAS_OGG) && defined(HAS_VORBIS) && defined(HAS_VORBISENC) #if defined(HAS_OGG) && defined(HAS_VORBIS) && defined(HAS_VORBIS_ENC)
else if (codec == "ogg") else if (codec == "ogg")
encoder = new OggEncoder(codecOptions); encoder = new OggEncoder(codecOptions);
#endif #endif