diff src/Silvet.h @ 314:f98ba4f47e49 livemode

Merge from default branch

--- a/src/Silvet.h	Mon Jan 19 09:33:35 2015 +0000
+++ b/src/Silvet.h	Tue Apr 28 11:24:23 2015 +0100
@@ -107,6 +107,10 @@
 
     Grid preProcess(const Grid &);
 
+    std::pair<vector<double>, vector<int> > applyEM(const InstrumentPack &pack,
+                                                    const vector<double> &column,
+                                                    bool wantShifts);
+    
     vector<double> postProcess(const vector<double> &pitches,
                                const vector<int> &bestShifts,
                                bool wantShifts); // -> piano roll column
@@ -115,7 +119,9 @@
 
     void emitNote(int start, int end, int note, int shiftCount,
                   FeatureList &noteFeatures);
-
+    
+    Vamp::RealTime getColumnTimestamp(int column);
+    
     Feature makeNoteFeature(int start, int end, int note, int shift,
                             int shiftCount, int velocity);
 
@@ -125,6 +131,7 @@
     
     void transcribe(const Grid &, FeatureSet &);
 
+    string chromaName(int n) const;
     string noteName(int n, int shift, int shiftCount) const;
     float noteFrequency(int n, int shift, int shiftCount) const;
 
@@ -132,11 +139,13 @@
     int m_columnCount;
     int m_resampledCount;
     Vamp::RealTime m_startTime;
+    bool m_haveStartTime;
 
     mutable int m_notesOutputNo;
     mutable int m_fcqOutputNo;
     mutable int m_pitchOutputNo;
     mutable int m_templateOutputNo;
+    mutable int m_chromaOutputNo;
 };
 
 #endif