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 001178a226eee51e0cf6247a391429e9dd6afce4..a4ad8ecff466be7770f093303867c2b8537f31b9 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -23,7 +23,11 @@
 #include "ardour/types.h"
 #include "ardour/processor.h"
 #include "pbd/fastlog.h"
-#include "kmeterdsp.h"
+
+#include "ardour/kmeterdsp.h"
+#include "ardour/iec1ppmdsp.h"
+#include "ardour/iec2ppmdsp.h"
+#include "ardour/vumeterdsp.h"
 
 namespace ARDOUR {
 
@@ -71,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; }
 
@@ -82,14 +89,6 @@ 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);
@@ -97,6 +96,8 @@ public:
 
        XMLNode& state (bool full);
 
+       PBD::Signal1<void, MeterType> TypeChanged;
+
 private:
        friend class IO;
 
@@ -110,7 +111,11 @@ private:
        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;
 };