=== modified file 'mixxx/src/dlgprefbeats.cpp'
--- mixxx/src/dlgprefbeats.cpp	2012-05-23 02:31:15 +0000
+++ mixxx/src/dlgprefbeats.cpp	2012-12-17 15:07:06 +0000
@@ -30,7 +30,6 @@
 DlgPrefBeats::DlgPrefBeats(QWidget *parent, ConfigObject<ConfigValue> *_config)
         : QWidget(parent) {
     m_pconfig = _config;
-    m_selectedAnalyser = "qm-tempotracker:0";
     setupUi(this);
 
     populate();
@@ -100,11 +99,17 @@
 }
 
 void DlgPrefBeats::setDefaults() {
-    if (!m_listIdentifier.contains("qm-tempotracker:0")) {
-        qDebug() << "DlgPrefBeats: qm-tempotracker Vamp plugin not found";
+    if (m_listIdentifier.size()==0) {
+        qDebug() << "DlgPrefBeats:No Vamp plugin not found";
         return;
     }
-    m_selectedAnalyser = "qm-tempotracker:0";
+    if (m_listIdentifier.contains("qm-tempotracker:0")) {
+        m_selectedAnalyser = "qm-tempotracker:0";
+    } else {
+        // the first one will always be the soundtouch one. defined in
+        // vamp-plugins/libmain.cpp
+        m_selectedAnalyser = m_listIdentifier.at(0);
+    }
     m_banalyserEnabled = true;
     m_bfixedtempoEnabled = true;
     m_boffsetEnabled = true;
@@ -168,7 +173,7 @@
 
     int comboselected = m_listIdentifier.indexOf(m_selectedAnalyser);
     if( comboselected==-1){
-        qDebug()<<"DlgPrefBeats: Plugin not found in slotUpdate()";
+        qDebug()<<"DlgPrefBeats: Plugin("<<m_selectedAnalyser<<") not found in slotUpdate()";
         return;
     }
 
@@ -215,7 +220,7 @@
 
 void DlgPrefBeats::populate() {
     VampAnalyser::initializePluginPaths();
-    QString selectedAnalyser = m_selectedAnalyser;
+    // QString selectedAnalyser = m_selectedAnalyser;
     m_listIdentifier.clear();
     m_listName.clear();
     m_listLibrary.clear();
@@ -244,16 +249,6 @@
                                  displayname.contains("marsyas_ibt:0")||
                                  displayname.contains("aubiotempo:0")
                                  );
-
-//                bool goodones = ((displaynametext.contains("Beat Track")));
-                //validate and add rows to qcombobox
-
-//                m_listVersion << QString::number(plugin->getPluginVersion());
-//                m_listMaker << QString::fromStdString(plugin->getMaker());
-//                m_listCopyright << QString::fromStdString(plugin->getCopyright());
-//                m_listOutput << QString::number(ioutput);
-//                m_listDescription << QString::fromStdString(outputs[ioutput].description);
-
                 if (goodones) {
                     m_listName << displaynametext;
                     QString pluginlibrary = QString::fromStdString(plugins[iplugin]).section(":",0,0);
@@ -268,6 +263,6 @@
             plugin = 0;
         }
     }
-    m_selectedAnalyser = selectedAnalyser;
+    // m_selectedAnalyser = selectedAnalyser;
 }
 

=== modified file 'mixxx/src/dlgprefbeats.h'
--- mixxx/src/dlgprefbeats.h	2012-04-12 15:22:39 +0000
+++ mixxx/src/dlgprefbeats.h	2012-12-17 14:04:26 +0000
@@ -1,7 +1,6 @@
-/*
- *  Created on: 28/apr/2011
- *      Author: vittorio
- */
+//  Created on: 28/apr/2011
+//      Author: vittorio
+
 
 #ifndef DLGPREFBEATS_H_
 #define DLGPREFBEATS_H_
@@ -21,7 +20,7 @@
     virtual ~DlgPrefBeats();
 
   public slots:
-    /** Apply changes to widget */
+    // Apply changes to widget
     void slotApply();
     void slotUpdate();
 
@@ -42,7 +41,7 @@
   private:
     void populate();
     void loadSettings();
-    /** Pointer to config object */
+    // Pointer to config object
     ConfigObject<ConfigValue>* m_pconfig;
     QList<QString> m_listName;
     QList<QString> m_listLibrary, m_listIdentifier;
@@ -52,4 +51,4 @@
     bool m_banalyserEnabled, m_bfixedtempoEnabled, m_boffsetEnabled, m_FastAnalysisEnabled, m_bReanalyze;
 };
 
-#endif /* DLGPREFBEATS_H_ */
+#endif // DLGPREFBEATS_H_

=== modified file 'mixxx/vamp-plugins/SConscript'
--- mixxx/vamp-plugins/SConscript	2012-05-14 20:55:43 +0000
+++ mixxx/vamp-plugins/SConscript	2012-12-17 13:58:08 +0000
@@ -35,6 +35,7 @@
 	"plugins/KeyDetect.cpp",
 	"plugins/BeatTrack.cpp",
 	"plugins/TonalChangeDetect.cpp",
+	"plugins/MixxxBpmDetection.cpp",
 	"libmain.cpp",
 ]
 

=== modified file 'mixxx/vamp-plugins/libmain.cpp'
--- mixxx/vamp-plugins/libmain.cpp	2012-05-14 20:55:43 +0000
+++ mixxx/vamp-plugins/libmain.cpp	2012-12-17 14:48:19 +0000
@@ -16,11 +16,11 @@
 #include "vamp-sdk/PluginAdapter.h"
 #include "plugins/BeatTrack.h"
 #include "plugins/BarBeatTrack.h"
-//#include "plugins/MixxxBpmDetection.h"
+#include "plugins/MixxxBpmDetection.h"
 
 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter;
 static Vamp::PluginAdapter<BarBeatTracker> barBeatTrackPluginAdapter;
-//static Vamp::PluginAdapter<MixxxBpmDetection> MixxxBpmDetection;
+static Vamp::PluginAdapter<MixxxBpmDetection> MixxxBpmDetection;
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
                                                     unsigned int index)
@@ -28,9 +28,10 @@
     if (vampApiVersion < 1) return 0;
 
     switch (index) {
-    case  0: return beatTrackerAdapter.getDescriptor();
-    case  1: return barBeatTrackPluginAdapter.getDescriptor();
-    //case  2: return MixxxBpmDetection.getDescriptor();
+    // !! cases have to start at 0 !!
+    case  0: return MixxxBpmDetection.getDescriptor();
+    case  1: return beatTrackerAdapter.getDescriptor();
+    case  2: return barBeatTrackPluginAdapter.getDescriptor();
     default: return 0;
     }
 }