prepare horizontal meters (level-meter H/V Box abstraction)

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index b3b86af4f3116e46644b6dbd9aab23154aab4e66..0d0e8638d992d5bf349dfdbc51f70a6daf2387e7 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -103,6 +103,7 @@ class SpeakerDialog;
 class ThemeManager;
 class TimeInfoBox;
 class MidiTracer;
+class LevelMeterHBox;
 class GlobalPortMatrixWindow;
 class GUIObjectState;
 
@@ -176,10 +177,17 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        static PublicEditor* _instance;
        static sigc::signal<void,bool> Blink;
+
+       /** point_zero_one_seconds -- 10Hz ^= 100ms */
        static sigc::signal<void>      RapidScreenUpdate;
+
+       /** point_zero_something_seconds -- currently 25Hz ^= 40ms */
        static sigc::signal<void>      SuperRapidScreenUpdate;
+
        /** Emitted frequently with the audible frame, false, and the edit point as
         *  parameters respectively.
+        *
+        *  (either RapidScreenUpdate || SuperRapidScreenUpdate - user-config)
         */
        static sigc::signal<void, framepos_t, bool, framepos_t> Clock;
 
@@ -273,6 +281,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void get_process_buffers ();
        void drop_process_buffers ();
 
+       void reset_peak_display ();
+       void reset_route_peak_display (ARDOUR::Route*);
+       void reset_group_peak_display (ARDOUR::RouteGroup*);
+
         const std::string& announce_string() const { return _announce_string; }
 
   protected:
@@ -436,6 +448,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ArdourButton feedback_alert_button;
 
        Gtk::VBox alert_box;
+       Gtk::VBox meter_box;
+       LevelMeterHBox * editor_meter;
 
        void solo_blink (bool);
        void sync_blink (bool);
@@ -520,12 +534,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        
        gint every_second ();
        gint every_point_one_seconds ();
-       gint every_point_zero_one_seconds ();
+       gint every_point_zero_something_seconds ();
 
        sigc::connection second_connection;
        sigc::connection point_one_second_connection;
-       sigc::connection point_oh_five_second_connection;
-       sigc::connection point_zero_one_second_connection;
+       sigc::connection point_zero_something_second_connection;
 
        void open_session ();
        void open_recent_session ();