diff src/Silvet.h @ 267:a8c05709e486

Merge from branch "norm"

--- a/src/Silvet.h	Tue Jul 22 18:32:00 2014 +0100
+++ b/src/Silvet.h	Wed Jul 23 17:51:58 2014 +0100
@@ -32,6 +32,7 @@
 
 class Resampler;
 class CQSpectrogram;
+class FlattenDynamics;
 
 class Silvet : public Vamp::Plugin
 {
@@ -74,6 +75,7 @@
     const std::vector<InstrumentPack> m_instruments;
 
     Resampler *m_resampler;
+    FlattenDynamics *m_flattener;
     CQSpectrogram *m_cq;
 
     bool m_hqMode;
@@ -86,6 +88,7 @@
     vector<MedianFilter<double> *> m_postFilter;
     vector<map<int, double> > m_pianoRoll;
     vector<map<int, int> > m_pianoRollShifts;
+    map<Vamp::RealTime, float> m_inputGains;
 
     Grid preProcess(const Grid &);
 
@@ -98,6 +101,11 @@
     void emitNote(int start, int end, int note, int shiftCount,
                   FeatureList &noteFeatures);
 
+    Feature makeNoteFeature(int start, int end, int note, int shift,
+                            int shiftCount, int velocity);
+
+    float getInputGainAt(Vamp::RealTime t);
+
     FeatureSet transcribe(const Grid &);
 
     string noteName(int n, int shift, int shiftCount) const;