Mercurial > hg > qm-dsp
diff dsp/segmentation/ClusterMeltSegmenter.h @ 493:bb78ca3fe7de
Remove "using" from some headers
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Fri, 31 May 2019 17:24:50 +0100 |
| parents | 7f2dadbdb544 |
| children |
line wrap: on
line diff
--- a/dsp/segmentation/ClusterMeltSegmenter.h Fri May 31 16:55:25 2019 +0100 +++ b/dsp/segmentation/ClusterMeltSegmenter.h Fri May 31 17:24:50 2019 +0100 @@ -23,8 +23,6 @@ #include "hmm/hmm.h" #include "base/Window.h" -using std::vector; - class Decimator; class ConstantQ; class MFCC; @@ -68,7 +66,7 @@ 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; } @@ -85,7 +83,7 @@ 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