position+width panning improvements (reverse width now works); relabel pan automation...

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 10272ee733c5b56616429224a6f33d837d595bba..dad86d518572d0b2937e678eb8437034ad8857e2 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -20,9 +20,9 @@
 #define __ardour_meter_h__
 
 #include <vector>
-#include <sigc++/slot.h>
 #include "ardour/types.h"
 #include "ardour/processor.h"
+#include "pbd/signals.h"
 #include "pbd/fastlog.h"
 
 namespace ARDOUR {
@@ -34,16 +34,11 @@ class Session;
 class Metering {
   public:
        static void               update_meters ();
-       static sigc::signal<void> Meter;
-
-       static sigc::connection   connect (sigc::slot<void> the_slot);
-       static void               disconnect (sigc::connection& c);
+       static PBD::Signal0<void> Meter;
 
   private:
        /* this object is not meant to be instantiated */
-       virtual void foo() = 0;
-
-       static Glib::StaticMutex    m_meter_signal_lock;
+       Metering();
 };
 
 /** Meters peaks on the input and stores them for access.
@@ -51,7 +46,6 @@ class Metering {
 class PeakMeter : public Processor {
 public:
        PeakMeter(Session& s) : Processor(s, "Meter") {}
-       PeakMeter(Session&s, const XMLNode& node);
 
        void meter();
        void reset ();
@@ -59,9 +53,25 @@ 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.
+       */
+
+       void reset_max_channels (const ChanCount&);
+
+       /* tell the meter than no matter how many channels it can handle,
+          `in' is the number it is actually going be handling from
+          now on.
+       */
+
+       void reflect_inputs (const ChanCount& in);
 
        /** Compute peaks */
-       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+       void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_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()) {
@@ -80,10 +90,12 @@ public:
        }
 
        XMLNode& state (bool full);
-
+       
 private:
        friend class IO;
-
+       
+       ChanCount current_meters;
+       
        std::vector<float> _peak_power;
        std::vector<float> _visible_peak_power;
        std::vector<float> _max_peak_power;