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 abb5e327edf1d38e3bd641991adb87a2ba15b3c2..758b94c37bd310e72a9468176dc9c225ecea9ed4 100644 (file)
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -49,7 +49,7 @@ namespace Gtk {
        class Menu;
 }
 
-class LevelMeterBase : public ARDOUR::SessionHandlePtr
+class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
   public:
        LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir,
@@ -65,12 +65,14 @@ class LevelMeterBase : 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:
@@ -107,6 +109,8 @@ class LevelMeterBase : 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;
@@ -120,8 +124,6 @@ class LevelMeterBase : 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 ();
 };