diff dsp/segmentation/Segmenter.h @ 505:930b5b0f707d

Merge branch 'codestyle-and-tidy'

--- a/dsp/segmentation/Segmenter.h	Thu May 30 16:18:13 2019 +0100
+++ b/dsp/segmentation/Segmenter.h	Wed Jun 05 12:55:15 2019 +0100
@@ -1,6 +1,4 @@
-#ifndef _SEGMENTER_H
-#define _SEGMENTER_H
-
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 /*
  *  Segmenter.h
  *  soundbite
@@ -16,47 +14,47 @@
  *
  */
 
+#ifndef QM_DSP_SEGMENTER_H
+#define QM_DSP_SEGMENTER_H
+
 #include <vector>
 #include <iostream>
 
-using std::vector;
-using std::ostream;
-
 class Segment
 {
 public:
-	int start;		// in samples
-	int end;
-	int type;
+    int start;              // in samples
+    int end;
+    int type;
 };
 
 class Segmentation
 {
 public:
-	int nsegtypes;		// number of segment types, so possible types are {0,1,...,nsegtypes-1}
-	int samplerate;
-	vector<Segment> segments;	
+    int nsegtypes;          // number of segment types, so possible types are {0,1,...,nsegtypes-1}
+    int samplerate;
+    std::vector<Segment> segments;       
 };
 
-ostream& operator<<(ostream& os, const Segmentation& s);
+std::ostream& operator<<(std::ostream& os, const Segmentation& s);
 
 class Segmenter
 {
 public:
-	Segmenter() {}
-	virtual ~Segmenter() {}
-	virtual void initialise(int samplerate) = 0;	// must be called before any other methods
-	virtual int getWindowsize() = 0;				// required window size for calls to extractFeatures()
-	virtual int getHopsize() = 0;					// required hop size for calls to extractFeatures()
-	virtual void extractFeatures(const double* samples, int nsamples) = 0;
-	virtual void segment() = 0;						// call once all the features have been extracted
-	virtual void segment(int m) = 0;				// specify desired number of segment-types
-	virtual void clear() { features.clear(); }
-	const Segmentation& getSegmentation() const { return segmentation; } 
+    Segmenter() {}
+    virtual ~Segmenter() {}
+    virtual void initialise(int samplerate) = 0;    // must be called before any other methods
+    virtual int getWindowsize() = 0;                                // required window size for calls to extractFeatures()
+    virtual int getHopsize() = 0;                                   // required hop size for calls to extractFeatures()
+    virtual void extractFeatures(const double* samples, int nsamples) = 0;
+    virtual void segment() = 0;                                             // call once all the features have been extracted
+    virtual void segment(int m) = 0;                                // specify desired number of segment-types
+    virtual void clear() { features.clear(); }
+    const Segmentation& getSegmentation() const { return segmentation; } 
 protected:
-	vector<vector<double> > features;
-	Segmentation segmentation;
-	int samplerate;
+    std::vector<std::vector<double> > features;
+    Segmentation segmentation;
+    int samplerate;
 };
 
 #endif