comparison dsp/segmentation/ClusterMeltSegmenter.h @ 493:bb78ca3fe7de

Remove "using" from some headers

 
 #include "segment.h"
 #include "Segmenter.h"
 #include "hmm/hmm.h"
 #include "base/Window.h"
-
-using std::vector;
 
 class Decimator;
 class ConstantQ;
 class MFCC;
 class FFTReal;

     virtual ~ClusterMeltSegmenter();
     virtual void initialise(int samplerate);
     virtual int getWindowsize();
     virtual int getHopsize();
     virtual void extractFeatures(const double* samples, int nsamples);
-    void setFeatures(const vector<vector<double> >& f);         // provide the features yourself
+    void setFeatures(const std::vector<std::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:

     FFTReal *fft;
     ConstantQ* constq; 
     MFCC* mfcc;
     model_t* model;                             // the HMM
     int* q;                                     // the decoded HMM state sequence
-    vector<vector<double> > histograms; 
+    std::vector<std::vector<double> > histograms; 
     
     feature_types featureType;  
     double hopSize;             // in seconds
     double windowSize;  // in seconds