Mercurial > hg > silvet

diff src/Silvet.h @ 168:51bd3d833db8 finetune

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Store active shifts separately from active pitches
author Chris Cannam
date Wed, 21 May 2014 09:11:49 +0100
parents 416b555df3b2
children 192c4ba3de45
line wrap: on
line diff
--- a/src/Silvet.h	Tue May 20 17:49:07 2014 +0100
+++ b/src/Silvet.h	Wed May 21 09:11:49 2014 +0100
@@ -85,16 +85,16 @@
 
     vector<MedianFilter<double> *> m_postFilter;
     vector<map<int, double> > m_pianoRoll;
+    vector<map<int, int> > m_pianoRollShifts;
 
     Grid preProcess(const Grid &);
 
-    map<int, double> postProcess(const float *pitches,
-                                 const float *const *shifts,
-                                 int shiftCount,
-                                 double gain); // -> piano roll column
+    void postProcess(const float *pitches,
+                     const float *const *shifts,
+                     int shiftCount,
+                     double gain); // -> piano roll column
 
-    FeatureList noteTrack(const map<int, double> &pianoRollColumn, 
-                          int shiftCount);
+    FeatureList noteTrack(int shiftCount);
 
     FeatureSet transcribe(const Grid &);