a more reliable/robust/less complex version of previous commit

[ardour.git] / gtk2_ardour / level_meter.h

diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 0a59f1a337b2ab4485d87931c28cd91411164f41..758b94c37bd310e72a9468176dc9c225ecea9ed4 100644 (file)
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -49,12 +49,12 @@ namespace Gtk {
        class Menu;
 }
 
-class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr
+class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
   public:
-       LevelMeterBase (ARDOUR::Session*,
+       LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir,
                        Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical);
-       ~LevelMeterBase ();
+       virtual ~LevelMeterBase ();
 
        virtual void set_meter (ARDOUR::PeakMeter* meter);
 
@@ -65,12 +65,14 @@ class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr
        void clear_meters (bool reset_highlight = true);
        void hide_meters ();
        void setup_meters (int len=0, int width=3, int thin=2);
+       void set_max_audio_meter_count (uint32_t cnt = 0);
 
        void set_type (ARDOUR::MeterType);
        ARDOUR::MeterType get_type () { return meter_type; }
 
        /** Emitted in the GUI thread when a button is pressed over the meter */
        PBD::Signal1<bool, GdkEventButton *> ButtonPress;
+       PBD::Signal1<bool, GdkEventButton *> ButtonRelease;
        PBD::Signal1<void, ARDOUR::MeterType> MeterTypeChanged;
 
        protected:
@@ -78,6 +80,7 @@ class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr
        virtual void mtr_remove(Gtk::Widget &w) = 0;
 
   private:
+       PBD::EventLoop::InvalidationRecord* parent_invalidator;
        ARDOUR::PeakMeter* _meter;
        Gtkmm2ext::FastMeter::Orientation _meter_orientation;
 
@@ -106,6 +109,8 @@ class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr
        float                  max_peak;
        ARDOUR::MeterType      meter_type;
        ARDOUR::MeterType      visible_meter_type;
+       uint32_t               meter_count;
+       uint32_t               max_visible_meters;
 
        PBD::ScopedConnection _configuration_connection;
        PBD::ScopedConnection _meter_type_connection;
@@ -119,8 +124,6 @@ class LevelMeterBase : public sigc::trackable, public ARDOUR::SessionHandlePtr
        void configuration_changed (ARDOUR::ChanCount in, ARDOUR::ChanCount out);
        void meter_type_changed (ARDOUR::MeterType);
 
-       void on_theme_changed ();
-       bool style_changed;
        bool color_changed;
        void color_handler ();
 };