Small cleanup: add constructor to InterThreadInfo.

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index ae0a1672dbf59609a3fe358a1b911146e979807e..80adcd41560bb3d862c2fd661d48b972daa18787 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 */
        Metering();
-
-       static Glib::StaticMutex    m_meter_signal_lock;
 };
 
 /** 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 ();
@@ -76,6 +70,9 @@ public:
        /** Compute peaks */
        void run (BufferSet& bufs, sframes_t start_frame, sframes_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()) {
                        return _visible_peak_power[n];
@@ -97,7 +94,7 @@ public:
 private:
        friend class IO;
        
-       uint32_t current_meters;
+       ChanCount current_meters;
        
        std::vector<float> _peak_power;
        std::vector<float> _visible_peak_power;