changeset 37:9ce0db4770a2

* work on integrating segmenter (not yet done)

--- a/libmain.cpp	Wed Jan 09 10:39:43 2008 +0000
+++ b/libmain.cpp	Wed Jan 09 16:51:59 2008 +0000
@@ -16,6 +16,7 @@
 #include "plugins/ConstantQSpectrogram.h"
 #include "plugins/TonalChangeDetect.h"
 #include "plugins/KeyDetect.h"
+#include "plugins/SegmenterPlugin.h"
 
 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter;
 static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter;
@@ -23,6 +24,7 @@
 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter;
 static Vamp::PluginAdapter<TonalChangeDetect> tonalChangeDetectorAdapter;
 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter;
+static Vamp::PluginAdapter<SegmenterPlugin> segmenterPluginAdapter;
 
 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
                                                     unsigned int index)
@@ -36,6 +38,7 @@
     case  3: return constantQAdapter.getDescriptor();
     case  4: return tonalChangeDetectorAdapter.getDescriptor();
     case  5: return keyDetectorAdapter.getDescriptor();
+    case  6: return segmenterPluginAdapter.getDescriptor();
     default: return 0;
     }
 }

--- a/plugins/SegmenterPlugin.cpp	Wed Jan 09 10:39:43 2008 +0000
+++ b/plugins/SegmenterPlugin.cpp	Wed Jan 09 16:51:59 2008 +0000
@@ -11,7 +11,7 @@
 #include <sstream>
 
 #include "SegmenterPlugin.h"
-#include "ClusterMeltSegmenter.h"
+#include "dsp/segmentation/ClusterMeltSegmenter.h"
 
 using std::string;
 using std::vector;
@@ -46,7 +46,7 @@
 string
 SegmenterPlugin::getCopyright() const
 {
-    return "All rights reserved";
+    return "Copyright (c) 2006-2008 - All Rights Reserved";
 }
 
 bool
@@ -163,7 +163,7 @@
 	if (params.featureType == FEATURE_TYPE_CONSTQ)
 	{
 		params.ncomponents = 20;
-		params.neighbourhoodLimit = 30;					
+		params.neighbourhoodLimit = 30; 
 	}
 	if (params.featureType == FEATURE_TYPE_CHROMA)
 	{

--- a/plugins/SegmenterPlugin.h	Wed Jan 09 10:39:43 2008 +0000
+++ b/plugins/SegmenterPlugin.h	Wed Jan 09 16:51:59 2008 +0000
@@ -12,8 +12,8 @@
 
 #include <vamp-sdk/Plugin.h>
 #include <vamp-sdk/RealTime.h>
-#include "Segmenter.h"
-#include "segment.h"
+#include "dsp/segmentation/Segmenter.h"
+#include "dsp/segmentation/segment.h"
 
 class SegmenterPlugin : public Vamp::Plugin
 {
@@ -24,7 +24,7 @@
     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
     void reset();
 	
-	std::string getIdentifier() const { return "segmenter"; }
+	std::string getIdentifier() const { return "qm-segmenter"; }
 	std::string getName() const { return "Segmenter"; }
     std::string getDescription() const { return "Divide the track into a sequence of consistent segments"; }
     std::string getMaker() const;

--- a/qm-vamp-plugins.cat	Wed Jan 09 10:39:43 2008 +0000
+++ b/qm-vamp-plugins.cat	Wed Jan 09 16:51:59 2008 +0000
@@ -4,3 +4,4 @@
 vamp:qm-vamp-plugins:qm-constantq::Visualisation
 vamp:qm-vamp-plugins:qm-tonalchange::Key and Tonality
 vamp:qm-vamp-plugins:qm-keydetector::Key and Tonality
+vamp:qm-vamp-plugins:qm-segmenter::Key and Tonality

--- a/qm-vamp-plugins.pro	Wed Jan 09 10:39:43 2008 +0000
+++ b/qm-vamp-plugins.pro	Wed Jan 09 16:51:59 2008 +0000
@@ -12,7 +12,8 @@
 INCLUDEPATH += ../vamp-plugin-sdk ../qm-dsp
 LIBPATH += ../vamp-plugin-sdk/vamp-sdk ../qm-dsp
 
-LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -Wl,-Bdynamic
+linux-g++:LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -llapack -lblas -lg2c -Wl,-Bdynamic
+#LIBS += -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/atlas/sse -lblas -llapack -lg2c -Wl,-Bdynamic
 
 DEPENDPATH += plugins
 INCLUDEPATH += . plugins
@@ -23,11 +24,14 @@
            plugins/ChromagramPlugin.h \
            plugins/ConstantQSpectrogram.h \
            plugins/KeyDetect.h \
+           plugins/SegmenterPlugin.h \
            plugins/TonalChangeDetect.h
 SOURCES += plugins/BeatTrack.cpp \
            plugins/OnsetDetect.cpp \
            plugins/ChromagramPlugin.cpp \
            plugins/ConstantQSpectrogram.cpp \
            plugins/KeyDetect.cpp \
+           plugins/SegmenterPlugin.cpp \
            plugins/TonalChangeDetect.cpp \
            ./libmain.cpp
+