comparison dsp/segmentation/ClusterMeltSegmenter.h @ 20:8bdbda7fb893

* First cut at properly integrating the segmenter and making it work right

 
 #include <vector>
 
 #include "segment.h"
 #include "Segmenter.h"
-#include "hmm.h"
-#include "lib_constQ.h"
+#include "hmm/hmm.h"
+#include "base/Window.h"
+#include "dsp/chromagram/ConstantQ.h"
 
 using std::vector;
 
 class ClusterMeltSegmenterParams		// defaults are sensible for 11025Hz with 0.2 second hopsize
 {

 {
 public:
 	ClusterMeltSegmenter(ClusterMeltSegmenterParams params);
 	virtual ~ClusterMeltSegmenter();
 	virtual void initialise(int samplerate);
-	virtual int getWindowsize() { return static_cast<int>(windowSize * samplerate); }
-	virtual int getHopsize() { return static_cast<int>(hopSize * samplerate); }
+	virtual int getWindowsize();
+	virtual int getHopsize();
 	virtual void extractFeatures(double* samples, int nsamples);
 	void setFeatures(const vector<vector<double> >& f);		// provide the features yourself
 	virtual void segment();		// segment into default number of segment-types
 	void segment(int m);		// segment into m segment-types
 	int getNSegmentTypes() { return nclusters; }
 protected:
 	//void mpeg7ConstQ();
 	void makeSegmentation(int* q, int len);
 	
-	double* window;
-	int windowLength;			// in samples
-	constQ_t* constq;	
+	Window<double> *window;
+//	int windowLength;			// in samples
+	ConstantQ* constq;	
 	model_t* model;				// the HMM
 	//vector<int> stateSequence;
 	//vector<int> segmentTypeSequence;
 	int* q;						// the decoded HMM state sequence
 	vector<vector<double> > histograms;