make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 2cf474afbaae3dfd7f9854a82486350fe6487400..be8472b170f52e8a0161dbaac4d358214cd89884 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -1,16 +1,16 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-    
+    Copyright (C) 2006 Paul Davis
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     675 Mass Ave, Cambridge, MA 02139, USA.
@@ -20,9 +20,10 @@
 #define __ardour_meter_h__
 
 #include <vector>
-#include <ardour/types.h>
-#include <ardour/processor.h>
-#include <pbd/fastlog.h>
+#include <sigc++/slot.h>
+#include "ardour/types.h"
+#include "ardour/processor.h"
+#include "pbd/fastlog.h"
 
 namespace ARDOUR {
 
@@ -30,30 +31,49 @@ class BufferSet;
 class ChanCount;
 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);
+
+  private:
+       /* this object is not meant to be instantiated */
+       virtual void foo() = 0;
+
+       static Glib::StaticMutex    m_meter_signal_lock;
+};
 
 /** Meters peaks on the input and stores them for access.
  */
 class PeakMeter : public Processor {
 public:
-       PeakMeter(Session& s) : Processor(s, "meter", PreFader) {}
+       PeakMeter(Session& s) : Processor(s, "Meter") {}
+       PeakMeter(Session&s, const XMLNode& node);
+
+       bool visible() const;
+
+       void meter();
 
        void reset ();
        void reset_max ();
-       
-       bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const { return true; }
+
+       bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
        bool configure_io (ChanCount in, ChanCount out);
-       
+
        /** Compute peaks */
-       void run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset);
-       
-       float peak_power (uint32_t n) { 
+       void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+
+       float peak_power (uint32_t n) {
                if (n < _visible_peak_power.size()) {
                        return _visible_peak_power[n];
                } else {
                        return minus_infinity();
                }
        }
-       
+
        float max_peak_power (uint32_t n) {
                if (n < _max_peak_power.size()) {
                        return _max_peak_power[n];
@@ -62,12 +82,10 @@ public:
                }
        }
 
+       XMLNode& state (bool full);
+
 private:
-       /* disallow copy construction */
-       PeakMeter (PeakMeter const &);
-       
        friend class IO;
-       void meter();
 
        std::vector<float> _peak_power;
        std::vector<float> _visible_peak_power;