diff options
| author | Be <be@mixxx.org> | 2021-02-09 14:28:51 -0600 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2021-02-16 23:50:36 -0600 |
| commit | 1eab1d0a4cf89f22d3bb7f24e77cb92a18a62e0c (patch) | |
| tree | c73c5f0372238b8322331a9d2aed130b843d3831 | |
| parent | 969975e1a941bd1ec7325bede19b273c0554bcbd (diff) | |
Encoder: fix build with OPUS=OFF
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/encoder/encoder.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f310304e1..84edfaf36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -473,7 +473,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/encoder/encoderflacsettings.cpp src/encoder/encodermp3.cpp src/encoder/encodermp3settings.cpp - src/encoder/encoderopussettings.cpp src/encoder/encodersndfileflac.cpp src/encoder/encodervorbis.cpp src/encoder/encodervorbissettings.cpp @@ -2385,6 +2384,7 @@ if(OPUS) target_sources(mixxx-lib PRIVATE src/sources/soundsourceopus.cpp src/encoder/encoderopus.cpp + src/encoder/encoderopussettings.cpp ) target_compile_definitions(mixxx-lib PUBLIC __OPUS__) target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS}) diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp index 61853ff947..8cee16a0ff 100644 --- a/src/encoder/encoder.cpp +++ b/src/encoder/encoder.cpp @@ -141,8 +141,10 @@ EncoderRecordingSettingsPointer EncoderFactory::getEncoderRecordingSettings(Enco return std::make_shared<EncoderMp3Settings>(pConfig); } else if (format.internalName == ENCODING_OGG) { return std::make_shared<EncoderVorbisSettings>(pConfig); +#ifdef __OPUS__ } else if (format.internalName == ENCODING_OPUS) { return std::make_shared<EncoderOpusSettings>(pConfig); +#endif } else if (format.internalName == ENCODING_AAC || format.internalName == ENCODING_HEAAC || format.internalName == ENCODING_HEAACV2) { |