add lib/LV2 path akin to lib/surfaces, to allow bundling of LV2 plugins in an ardour...

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 80adcd41560bb3d862c2fd661d48b972daa18787..eea240f82145e138802960ec9f220ab3e9a832e0 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -22,7 +22,6 @@
 #include <vector>
 #include "ardour/types.h"
 #include "ardour/processor.h"
-#include "pbd/signals.h"
 #include "pbd/fastlog.h"
 
 namespace ARDOUR {
@@ -45,7 +44,7 @@ class Metering {
  */
 class PeakMeter : public Processor {
 public:
-       PeakMeter(Session& s) : Processor(s, "Meter") {}
+        PeakMeter(Session& s, const std::string& name);
 
        void meter();
        void reset ();
@@ -53,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.
        */
@@ -68,7 +67,7 @@ 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; }
@@ -90,12 +89,16 @@ public:
        }
 
        XMLNode& state (bool full);
-       
+
 private:
        friend class IO;
-       
+
+       /** 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;