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 79b5403daff04fb25ce0cbf6e4b6ec32501784d0..0d0e8638d992d5bf349dfdbc51f70a6daf2387e7 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -35,7 +35,6 @@
 #include <list>
 #include <cmath>
 
-#include <libgnomecanvasmm/canvas.h>
 
 #include "pbd/xml++.h"
 #include "pbd/controllable.h"
@@ -71,6 +70,7 @@
 #include "ardour_dialog.h"
 #include "ardour_window.h"
 #include "editing.h"
+#include "meterbridge.h"
 #include "nsm.h"
 #include "ui_config.h"
 #include "enums.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:
@@ -301,10 +313,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        Gtk::Tooltips        _tooltips;
        NSM_Client          *nsm;
        bool                 _was_dirty;
+        bool                 _mixer_on_top;
 
        void goto_editor_window ();
        void goto_mixer_window ();
        void toggle_mixer_window ();
+       void toggle_meterbridge ();
         void toggle_editor_mixer ();
 
        int  setup_windows ();
@@ -348,8 +362,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void         start_clocking ();
        void         stop_clocking ();
 
-       void manage_window (Gtk::Window&);
-
        bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor);
 
        void update_transport_clocks (framepos_t pos);
@@ -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 ();
@@ -571,25 +584,27 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        PublicEditor     *editor;
        int         create_editor ();
 
+       Meterbridge  *meterbridge;
+       int         create_meterbridge ();
         /* Dialogs that can be created via new<T> */
 
-        WindowManager::Proxy<SpeakerDialog> speaker_config_window;
-        WindowManager::Proxy<ThemeManager> theme_manager;
-        WindowManager::Proxy<KeyEditor> key_editor;
-        WindowManager::Proxy<RCOptionEditor> rc_option_editor;
-        WindowManager::Proxy<AddRouteDialog> add_route_dialog;
-        WindowManager::Proxy<About> about;
-        WindowManager::Proxy<LocationUIWindow> location_ui;
-        WindowManager::Proxy<RouteParams_UI> route_params;
+        WM::Proxy<SpeakerDialog> speaker_config_window;
+        WM::Proxy<ThemeManager> theme_manager;
+        WM::Proxy<KeyEditor> key_editor;
+        WM::Proxy<RCOptionEditor> rc_option_editor;
+        WM::Proxy<AddRouteDialog> add_route_dialog;
+        WM::Proxy<About> about;
+        WM::Proxy<LocationUIWindow> location_ui;
+        WM::Proxy<RouteParams_UI> route_params;
 
         /* Windows/Dialogs that require a creator method */
 
-        WindowManager::ProxyWithConstructor<SessionOptionEditor> session_option_editor;
-        WindowManager::ProxyWithConstructor<AddVideoDialog> add_video_dialog;
-        WindowManager::ProxyWithConstructor<BundleManager> bundle_manager;
-        WindowManager::ProxyWithConstructor<BigClockWindow> big_clock_window;
-        WindowManager::ProxyWithConstructor<GlobalPortMatrixWindow> audio_port_matrix;
-        WindowManager::ProxyWithConstructor<GlobalPortMatrixWindow> midi_port_matrix;
+        WM::ProxyWithConstructor<SessionOptionEditor> session_option_editor;
+        WM::ProxyWithConstructor<AddVideoDialog> add_video_dialog;
+        WM::ProxyWithConstructor<BundleManager> bundle_manager;
+        WM::ProxyWithConstructor<BigClockWindow> big_clock_window;
+        WM::ProxyWithConstructor<GlobalPortMatrixWindow> audio_port_matrix;
+        WM::ProxyWithConstructor<GlobalPortMatrixWindow> midi_port_matrix;
 
         /* creator methods */