Mercurial > hg > silvet

diff src/Silvet.h @ 320:7f9683c8de69 livemode

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor velocity calculations
author Chris Cannam
date Wed, 29 Apr 2015 09:51:09 +0100
parents c37da62ba4e5
children 213a51e197c8
line wrap: on
line diff
--- a/src/Silvet.h	Wed Apr 29 09:27:38 2015 +0100
+++ b/src/Silvet.h	Wed Apr 29 09:51:09 2015 +0100
@@ -127,19 +127,21 @@
     Vamp::RealTime getColumnTimestamp(int column);
     
     Feature makeNoteFeature(int start, int end, int note, int shift,
-                            int shiftCount, int velocity);
+                            int shiftCount, double strength);
     Feature makeOnsetFeature(int start, int note, int shift,
-                             int shiftCount, int velocity);
+                             int shiftCount, double strength);
 
+    int getVelocityFor(double strength, int column);
+    
     float getInputGainAt(Vamp::RealTime t);
 
     void insertTemplateFeatures(FeatureSet &);
     
     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;
+    string getChromaName(int n) const;
+    string getNoteName(int n, int shift, int shiftCount) const;
+    float getNoteFrequency(int n, int shift, int shiftCount) const;
 
     int m_blockSize;
     int m_columnCount;