diff src/Silvet.h @ 319:c37da62ba4e5 livemode

Add onsets output (lower-latency than the notes output)
author Chris Cannam
date Wed, 29 Apr 2015 09:27:38 +0100
parents f3e10617a60d
children 7f9683c8de69
line wrap: on
line diff
--- a/src/Silvet.h	Tue Apr 28 16:54:12 2015 +0100
+++ b/src/Silvet.h	Wed Apr 29 09:27:38 2015 +0100
@@ -116,15 +116,20 @@
                                const vector<int> &bestShifts,
                                bool wantShifts); // -> piano roll column
 
-    FeatureList noteTrack(int shiftCount);
+    std::pair<FeatureList, FeatureList> noteTrack(int shiftCount); // notes, onsets
 
     void emitNote(int start, int end, int note, int shiftCount,
                   FeatureList &noteFeatures);
+
+    void emitOnset(int start, 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);
+    Feature makeOnsetFeature(int start, int note, int shift,
+                             int shiftCount, int velocity);
 
     float getInputGainAt(Vamp::RealTime t);
 
@@ -143,6 +148,7 @@
     bool m_haveStartTime;
 
     mutable int m_notesOutputNo;
+    mutable int m_onsetsOutputNo;
     mutable int m_fcqOutputNo;
     mutable int m_pitchOutputNo;
     mutable int m_templateOutputNo;