Fix a few return types.

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 17379c3baa40d41caefb242261696b6420b8ba48..4a9f8305ad3bb454fe096702bb22f93dd89c2ad4 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,8 +20,10 @@
 #define __ardour_meter_h__
 
 #include <vector>
-#include <ardour/types.h>
-#include <pbd/fastlog.h>
+#include "ardour/types.h"
+#include "ardour/processor.h"
+#include "pbd/signals.h"
+#include "pbd/fastlog.h"
 
 namespace ARDOUR {
 
@@ -29,28 +31,56 @@ class BufferSet;
 class ChanCount;
 class Session;
 
+class Metering {
+  public:
+       static void               update_meters ();
+       static PBD::Signal0<void> Meter;
+
+  private:
+       /* this object is not meant to be instantiated */
+       Metering();
+};
 
 /** Meters peaks on the input and stores them for access.
  */
-class PeakMeter {
+class PeakMeter : public Processor {
 public:
-       PeakMeter(Session& s) : _session(s) {}
+       PeakMeter(Session& s) : Processor(s, "Meter") {}
 
-       void setup (const ChanCount& in);
+       void meter();
        void reset ();
        void reset_max ();
 
+       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, jack_nframes_t nframes, jack_nframes_t offset=0);
-       
-       float peak_power (uint32_t n) { 
+       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()) {
                        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];
@@ -59,12 +89,17 @@ public:
                }
        }
 
+       XMLNode& state (bool full);
+
 private:
-       
        friend class IO;
-       void meter();
 
-       Session&           _session;
+       /** 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;