Fix the build when opus is disabled and add Opus streaming/recording to the changelog.

5 files changed, 15 insertions, 10 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2b92ede03..55d15f010e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Unify skin controls for better consistency of settings across skins. [lp:1740513](https://bugs.launchpad.net/mixxx/+bug/1740513)
 * Remove VAMP plugin support. vamp-plugin-sdk and vamp-hostsdk are no longer required dependencies.
 * Remove SoundSource plugin support. [lp:1792747](https://bugs.launchpad.net/mixxx/+bug/1792747)
+* Add Opus streaming and recording support. [lp:1338413](https://bugs.launchpad.net/mixxx/+bug/1338413)
 
 ## [2.2.0](https://launchpad.net/mixxx/+milestone/2.2.0) (2018-12-17)
 
diff --git a/build/depends.py b/build/depends.py
index c0d65ade59..353e719477 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -1164,15 +1164,16 @@ class MixxxCore(Feature):
                    "src/soundio/soundmanagerutil.cpp",
 
                    "src/encoder/encoder.cpp",
+                   "src/encoder/encoderbroadcastsettings.cpp",
+                   "src/encoder/encoderflacsettings.cpp",
                    "src/encoder/encodermp3.cpp",
-                   "src/encoder/encodervorbis.cpp",
-                   "src/encoder/encoderwave.cpp",
-                   "src/encoder/encodersndfileflac.cpp",
                    "src/encoder/encodermp3settings.cpp",
+                   "src/encoder/encodersndfileflac.cpp",
+                   "src/encoder/encodervorbis.cpp",
                    "src/encoder/encodervorbissettings.cpp",
+                   "src/encoder/encoderwave.cpp",
                    "src/encoder/encoderwavesettings.cpp",
-                   "src/encoder/encoderflacsettings.cpp",
-                   "src/encoder/encoderbroadcastsettings.cpp",
+                   'src/encoder/encoderopussettings.cpp',
 
                    "src/util/sleepableqthread.cpp",
                    "src/util/statsmanager.cpp",
diff --git a/build/features.py b/build/features.py
index dfdec44f77..b4fe56a42c 100644
--- a/build/features.py
+++ b/build/features.py
@@ -761,13 +761,12 @@ class Opus(Feature):
 
         if build.platform_is_linux or build.platform_is_bsd:
             build.env.ParseConfig('pkg-config opusfile opus --silence-errors --cflags --libs')
-                    
+
         build.env.Append(CPPDEFINES='__OPUS__')
 
     def sources(self, build):
         return ['src/sources/soundsourceopus.cpp',
-                'src/encoder/encoderopus.cpp',
-                'src/encoder/encoderopussettings.cpp']
+                'src/encoder/encoderopus.cpp']
 
 
 class FFMPEG(Feature):
diff --git a/src/encoder/encoder.cpp b/src/encoder/encoder.cpp
index 77cbe87f58..7e37d725e7 100644
--- a/src/encoder/encoder.cpp
+++ b/src/encoder/encoder.cpp
@@ -30,8 +30,8 @@
 
 #ifdef __OPUS__
 #include "encoder/encoderopus.h"
-#include "encoder/encoderopussettings.h"
 #endif
+#include "encoder/encoderopussettings.h"
 
 #include <QList>
 
@@ -71,7 +71,7 @@ Encoder::Format EncoderFactory::getFormatFor(QString formatText) const
             return format;
         }
     }
-    qWarning() << "Format: " << formatText << " not recognized! Returning format " 
+    qWarning() << "Format: " << formatText << " not recognized! Returning format "
         << m_formats.first().internalName;
     return m_formats.first();
 }
diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp
index 9f5895ec37..639a9db12b 100644
--- a/src/engine/sidechain/shoutconnection.cpp
+++ b/src/engine/sidechain/shoutconnection.cpp
@@ -22,7 +22,9 @@
 #include "control/controlpushbutton.h"
 #include "encoder/encoder.h"
 #include "encoder/encoderbroadcastsettings.h"
+#ifdef __OPUS__
 #include "encoder/encoderopus.h"
+#endif
 #include "mixer/playerinfo.h"
 #include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
@@ -373,6 +375,7 @@ void ShoutConnection::updateFromPreferences() {
         return;
     }
 
+#ifdef __OPUS__
     if(m_format_is_opus && iMasterSamplerate != EncoderOpus::getMasterSamplerate()) {
         errorDialog(
             EncoderOpus::getInvalidSamplerateMessage(),
@@ -380,6 +383,7 @@ void ShoutConnection::updateFromPreferences() {
         );
         return;
     }
+#endif
 
     if (shout_set_audio_info(
             m_pShout, SHOUT_AI_BITRATE,