Sent precise transport information to LV2 plugins via events.

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 1f5e3307d6079abbc28757ddd4022f32a86da143..773b04f38650ece90a569d8dd161f3872abe5ba9 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -33,16 +33,11 @@ class Session;
 class Metering {
   public:
        static void               update_meters ();
-       static boost::signals2::signal<void()> Meter;
-
-       static boost::signals2::connection connect (boost::function<void()>);
-       static void                        disconnect (boost::signals2::connection& c);
+       static PBD::Signal0<void> Meter;
 
   private:
        /* this object is not meant to be instantiated */
        Metering();
-
-       static Glib::StaticMutex    m_meter_signal_lock;
 };
 
 /** Meters peaks on the input and stores them for access.
@@ -50,7 +45,6 @@ class Metering {
 class PeakMeter : public Processor {
 public:
        PeakMeter(Session& s) : Processor(s, "Meter") {}
-       PeakMeter(Session&s, const XMLNode& node);
 
        void meter();
        void reset ();
@@ -58,7 +52,7 @@ public:
 
        bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
-       
+
        /* special method for meter, to ensure that it can always handle the maximum
           number of streams in the route, no matter where we put it.
        */
@@ -73,7 +67,10 @@ public:
        void reflect_inputs (const ChanCount& in);
 
        /** Compute peaks */
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
+       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
+
+       ChanCount input_streams () const { return current_meters; }
+       ChanCount output_streams () const { return current_meters; }
 
        float peak_power (uint32_t n) {
                if (n < _visible_peak_power.size()) {
@@ -92,12 +89,16 @@ public:
        }
 
        XMLNode& state (bool full);
-       
+
 private:
        friend class IO;
-       
-       uint32_t current_meters;
-       
+
+       /** The number of meters that we are currently handling;
+        *  may be different to _configured_input and _configured_output
+        *  as it can be altered outside a ::configure_io by ::reflect_inputs.
+        */
+       ChanCount current_meters;
+
        std::vector<float> _peak_power;
        std::vector<float> _visible_peak_power;
        std::vector<float> _max_peak_power;