comparison src/Silvet.h @ 267:a8c05709e486

Merge from branch "norm"

 using std::set;
 using std::map;
 
 class Resampler;
 class CQSpectrogram;
+class FlattenDynamics;
 
 class Silvet : public Vamp::Plugin
 {
 public:
     Silvet(float inputSampleRate);

 
 protected:
     const std::vector<InstrumentPack> m_instruments;
 
     Resampler *m_resampler;
+    FlattenDynamics *m_flattener;
     CQSpectrogram *m_cq;
 
     bool m_hqMode;
     bool m_fineTuning;
     int m_instrument;

     typedef vector<vector<double> > Grid;
 
     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 &);
 
     void postProcess(const vector<double> &pitches,
                      const vector<int> &bestShifts,

 
     FeatureList noteTrack(int shiftCount);
 
     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;
     float noteFrequency(int n, int shift, int shiftCount) const;