Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 0ed5d145b43ce98235d7c93f1e9f674073eb4014..64309c7e38d6772d35a24a9cf8858ced5bcf8355 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -71,6 +71,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"
@@ -89,6 +90,7 @@ class BigClockWindow;
 class BundleManager;
 class ButtonJoiner;
 class ConnectionEditor;
+class EngineControl;
 class KeyEditor;
 class LocationUIWindow;
 class MainClock;
@@ -103,6 +105,7 @@ class SpeakerDialog;
 class ThemeManager;
 class TimeInfoBox;
 class MidiTracer;
+class LevelMeterHBox;
 class GlobalPortMatrixWindow;
 class GUIObjectState;
 
@@ -176,10 +179,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;
 
@@ -255,7 +265,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
                session_add_midi_route (false);
        }*/
 
-       int  create_engine ();
+        void attach_to_engine ();
        void post_engine ();
 
        gint exit_on_main_window_close (GdkEventAny *);
@@ -273,6 +283,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:
@@ -289,23 +303,23 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void reenable_hide_loop_punch_ruler_if_appropriate ();
        void toggle_auto_return ();
        void toggle_click ();
-
+        void toggle_audio_midi_setup ();
        void toggle_session_auto_loop ();
-
        void toggle_rc_options_window ();
        void toggle_session_options_window ();
 
   private:
        ArdourStartup*      _startup;
-       ARDOUR::AudioEngine *engine;
        Gtk::Tooltips        _tooltips;
        NSM_Client          *nsm;
        bool                 _was_dirty;
         bool                 _mixer_on_top;
+        bool first_time_engine_run;
 
        void goto_editor_window ();
        void goto_mixer_window ();
        void toggle_mixer_window ();
+       void toggle_meterbridge ();
         void toggle_editor_mixer ();
 
        int  setup_windows ();
@@ -435,6 +449,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ArdourButton feedback_alert_button;
 
        Gtk::VBox alert_box;
+       Gtk::VBox meter_box;
+       LevelMeterHBox * editor_meter;
+       float            editor_meter_max_peak;
+       ArdourButton     editor_meter_peak_display;
+       bool             editor_meter_peak_button_release (GdkEventButton*);
 
        void solo_blink (bool);
        void sync_blink (bool);
@@ -519,12 +538,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 ();
@@ -570,6 +588,8 @@ 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> */
 
         WM::Proxy<SpeakerDialog> speaker_config_window;
@@ -647,9 +667,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        int pending_state_dialog ();
        int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
 
-       void disconnect_from_jack ();
-       void reconnect_to_jack ();
-       void set_jack_buffer_size (ARDOUR::pframes_t);
+       void disconnect_from_engine ();
+       void reconnect_to_engine ();
+       void set_engine_buffer_size (ARDOUR::pframes_t);
 
        Gtk::MenuItem* jack_disconnect_item;
        Gtk::MenuItem* jack_reconnect_item;
@@ -690,6 +710,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void loading_message (const std::string& msg);
 
        PBD::ScopedConnectionList forever_connections;
+        PBD::ScopedConnection halt_connection; 
 
         void step_edit_status_change (bool);
 
@@ -703,7 +724,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void fontconfig_dialog ();
 
         int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
-        int ambiguous_file (std::string file, std::string path, std::vector<std::string> hits);
+        int ambiguous_file (std::string file, std::vector<std::string> hits);
 
        bool click_button_clicked (GdkEventButton *);
 
@@ -726,6 +747,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
         std::string _announce_string;
         void check_announcements ();
+
+        EngineControl* _audio_midi_setup;
+        void launch_audio_midi_setup ();
+        int do_audio_midi_setup (uint32_t);
 };
 
 #endif /* __ardour_gui_h__ */