use dedicated buffers for route (and track)

[ardour.git] / libs / ardour / ardour / meter.h

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index eea240f82145e138802960ec9f220ab3e9a832e0..a4ad8ecff466be7770f093303867c2b8537f31b9 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -24,6 +24,11 @@
 #include "ardour/processor.h"
 #include "pbd/fastlog.h"
 
+#include "ardour/kmeterdsp.h"
+#include "ardour/iec1ppmdsp.h"
+#include "ardour/iec2ppmdsp.h"
+#include "ardour/vumeterdsp.h"
+
 namespace ARDOUR {
 
 class BufferSet;
@@ -45,6 +50,7 @@ class Metering {
 class PeakMeter : public Processor {
 public:
         PeakMeter(Session& s, const std::string& name);
+        ~PeakMeter();
 
        void meter();
        void reset ();
@@ -69,6 +75,9 @@ public:
        /** Compute peaks */
        void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
+       void activate ()   { }
+       void deactivate () { }
+
        ChanCount input_streams () const { return current_meters; }
        ChanCount output_streams () const { return current_meters; }
 
@@ -80,16 +89,15 @@ public:
                }
        }
 
-       float max_peak_power (uint32_t n) {
-               if (n < _max_peak_power.size()) {
-                       return _max_peak_power[n];
-               } else {
-                       return minus_infinity();
-               }
-       }
+       float meter_level (uint32_t n, MeterType type);
+
+       void set_type(MeterType t);
+       MeterType get_type() { return _meter_type; }
 
        XMLNode& state (bool full);
 
+       PBD::Signal1<void, MeterType> TypeChanged;
+
 private:
        friend class IO;
 
@@ -99,11 +107,18 @@ private:
         */
        ChanCount current_meters;
 
-       std::vector<float> _peak_power;
+       std::vector<float> _peak_signal;
        std::vector<float> _visible_peak_power;
+       std::vector<float> _max_peak_signal;
        std::vector<float> _max_peak_power;
-};
 
+       std::vector<Kmeterdsp *> _kmeter;
+       std::vector<Iec1ppmdsp *> _iec1meter;
+       std::vector<Iec2ppmdsp *> _iec2meter;
+       std::vector<Vumeterdsp *> _vumeter;
+
+       MeterType _meter_type;
+};
 
 } // namespace ARDOUR