repair scons vamp=0 Bug #1530454

4 files changed, 20 insertions, 7 deletions

diff --git a/build/depends.py b/build/depends.py
index 0f54112fd8..19b2066e41 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -545,7 +545,6 @@ class MixxxCore(Feature):
                    "dlgprefcontrols.cpp",
                    "dlgprefwaveform.cpp",
                    "dlgprefautodj.cpp",
-                   "dlgprefkey.cpp",
                    "dlgprefreplaygain.cpp",
                    "dlgprefnovinyl.cpp",
                    "dlgabout.cpp",
@@ -647,7 +646,6 @@ class MixxxCore(Feature):
                    "analyserrg.cpp",
                    "analyserqueue.cpp",
                    "analyserwaveform.cpp",
-                   "analyserkey.cpp",
 
                    "controllers/controller.cpp",
                    "controllers/controllerengine.cpp",
diff --git a/build/features.py b/build/features.py
index 7682e7e81c..03d6fe466b 100644
--- a/build/features.py
+++ b/build/features.py
@@ -358,6 +358,8 @@ class Vamp(Feature):
     def configure(self, build, conf):
         if not self.enabled(build):
             return
+            
+        build.env.Append(CPPDEFINES='__VAMP__')
 
         # If there is no system vamp-hostdk installed, then we'll directly link
         # the vamp-hostsdk.
@@ -383,7 +385,9 @@ class Vamp(Feature):
         sources = ['vamp/vampanalyser.cpp',
                    'vamp/vamppluginloader.cpp',
                    'analyserbeats.cpp',
-                   'dlgprefbeats.cpp']
+                   'analyserkey.cpp',
+                   'dlgprefbeats.cpp', 
+                   'dlgprefkey.cpp']
         if self.INTERNAL_LINK:
             hostsdk_src_path = '%s/src/vamp-hostsdk' % self.INTERNAL_VAMP_PATH
             sources.extend(path % hostsdk_src_path for path in
diff --git a/src/analyserqueue.cpp b/src/analyserqueue.cpp
index ba4f12bcaa..54487722e9 100644
--- a/src/analyserqueue.cpp
+++ b/src/analyserqueue.cpp
@@ -13,13 +13,16 @@
 #include "library/trackcollection.h"
 #include "analyserwaveform.h"
 #include "analyserrg.h"
-#include "analyserbeats.h"
-#include "analyserkey.h"
-#include "vamp/vampanalyser.h"
 #include "util/compatibility.h"
 #include "util/event.h"
 #include "util/trace.h"
 
+#ifdef __VAMP__
+#include "analyserbeats.h"
+#include "analyserkey.h"
+#include "vamp/vampanalyser.h"
+#endif
+
 // Measured in 0.1%,
 // 0 for no progress during finalize
 // 1 to display the text "finalizing"
@@ -436,9 +439,11 @@ AnalyserQueue* AnalyserQueue::createDefaultAnalyserQueue(
 
     ret->addAnalyser(new AnalyserWaveform(pConfig));
     ret->addAnalyser(new AnalyserGain(pConfig));
+#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(pConfig));
     ret->addAnalyser(new AnalyserKey(pConfig));
+#endif
 
     ret->start(QThread::LowPriority);
     return ret;
@@ -450,9 +455,11 @@ AnalyserQueue* AnalyserQueue::createAnalysisFeatureAnalyserQueue(
     AnalyserQueue* ret = new AnalyserQueue(pTrackCollection);
 
     ret->addAnalyser(new AnalyserGain(pConfig));
+#ifdef __VAMP__
     VampAnalyser::initializePluginPaths();
     ret->addAnalyser(new AnalyserBeats(pConfig));
     ret->addAnalyser(new AnalyserKey(pConfig));
+#endif
 
     ret->start(QThread::LowPriority);
     return ret;
diff --git a/src/dlgpreferences.cpp b/src/dlgpreferences.cpp
index dac3eb2e18..a4d2280c2c 100644
--- a/src/dlgpreferences.cpp
+++ b/src/dlgpreferences.cpp
@@ -109,10 +109,13 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader,
     m_wcrossfader = new DlgPrefCrossfader(this, m_pConfig);
     addPageWidget(m_wcrossfader);
 
+#ifdef __VAMP__
     m_wbeats = new DlgPrefBeats(this, m_pConfig);
     addPageWidget (m_wbeats);
     m_wkey = new DlgPrefKey(this, m_pConfig);
     addPageWidget(m_wkey);
+#endif
+
     m_wreplaygain = new DlgPrefReplayGain(this, m_pConfig);
     addPageWidget(m_wreplaygain);
     m_wrecord = new DlgPrefRecord(this, m_pConfig);
@@ -210,7 +213,7 @@ void DlgPreferences::createIcons() {
     m_pRecordingButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pRecordingButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-
+#ifdef __VAMP__
     m_pBeatDetectionButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
     m_pBeatDetectionButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_bpmdetect.png"));
     m_pBeatDetectionButton->setText(0, tr("Beat Detection"));
@@ -222,6 +225,7 @@ void DlgPreferences::createIcons() {
     m_pKeyDetectionButton->setText(0, tr("Key Detection"));
     m_pKeyDetectionButton->setTextAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
     m_pKeyDetectionButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#endif
 
     m_pReplayGainButton = new QTreeWidgetItem(contentsTreeWidget, QTreeWidgetItem::Type);
     m_pReplayGainButton->setIcon(0, QIcon(":/images/preferences/ic_preferences_replaygain.png"));