fix merge issues with master

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

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 4ac140fd04d75661b66032811888283b5f8d4d78..df1e381bb45c89b59a892d5872e43fa89204dc51 100644 (file)
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -56,7 +56,7 @@ public:
        void reset ();
        void reset_max ();
 
-       bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
+       bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
        bool configure_io (ChanCount in, ChanCount out);
 
        /* special method for meter, to ensure that it can always handle the maximum
@@ -75,6 +75,9 @@ public:
        /** Compute peaks */
        void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool);
 
+       void activate ()   { }
+       void deactivate () { }
+
        ChanCount input_streams () const { return current_meters; }
        ChanCount output_streams () const { return current_meters; }