From c5ef7198f7c251d6d42207acfa80f16c5931b5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sun, 3 Jan 2016 23:42:22 +0100 Subject: repair scons vamp=0 Bug #1530454 --- src/analyserqueue.cpp | 13 ++++++++++--- src/dlgpreferences.cpp | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'src') 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")); -- cgit v1.2.3