make GTKOSX button2 emulation actually work when clicking on redirect names

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index e71740134a944512ca64d3e5eb8658303e707da3..a0c84a18d840d37dd6c054057f17b8b46b5bd66b 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -58,6 +58,7 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <ardour/ardour.h>
 #include <ardour/session.h>
+#include <ardour/types.h>
 
 #include "audio_clock.h"
 #include "ardour_dialog.h"
@@ -116,6 +117,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void hide_about ();
        
        void idle_load (const Glib::ustring& path);
+       void finish();
+
        int load_session (const Glib::ustring& path, const Glib::ustring& snapshot, Glib::ustring mix_template = Glib::ustring());
        bool session_loaded;
        int build_session (const Glib::ustring& path, const Glib::ustring& snapshot, 
@@ -177,8 +180,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void name_io_setup (ARDOUR::AudioEngine&, string&, ARDOUR::IO& io, bool in);
 
-       static gint hide_and_quit (GdkEventAny *ev, ArdourDialog *);
-
        XMLNode* editor_settings() const;
        XMLNode* mixer_settings () const;
        XMLNode* keyboard_settings () const;
@@ -275,8 +276,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        Gtk::Tooltips          _tooltips;
 
-       void                     goto_editor_window ();
-       void                     goto_mixer_window ();
+       void                goto_editor_window ();
+       void                goto_mixer_window ();
+       void                toggle_editor_mixer_on_top ();
+       bool                _mixer_on_top;
 
        GlobalClickBox     *online_control_button;
        vector<string>      online_control_strings;
@@ -297,7 +300,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void startup ();
        void shutdown ();
 
-       void finish();
        int  ask_about_saving_session (const string & why);
 
        /* periodic safety backup, to be precise */
@@ -338,6 +340,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        AudioClock   big_clock;
        Gtk::Window* big_clock_window;
 
+       void float_big_clock (Gtk::Window* parent);
+       bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor);
+
        void update_transport_clocks (nframes_t pos);
        void record_state_changed ();
 
@@ -560,6 +565,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void transport_goto_zero ();
        void transport_goto_start ();
        void transport_goto_end ();
+       void transport_goto_wallclock ();
        void transport_stop ();
        void transport_stop_and_forget_capture ();
        void transport_record (bool roll);
@@ -643,16 +649,18 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void flush_trash ();
 
        bool have_configure_timeout;
-       struct timeval last_configure_time;
+       ARDOUR::microseconds_t last_configure_time;
        gint configure_timeout ();
 
-       struct timeval last_peak_grab;
-       struct timeval last_shuttle_request;
+       ARDOUR::microseconds_t last_peak_grab;
+       ARDOUR::microseconds_t last_shuttle_request;
 
        bool have_disk_speed_dialog_displayed;
        void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);
        void disk_overrun_handler ();
        void disk_underrun_handler ();
+       
+       bool preset_file_exists_handler ();
 
        void session_dialog (std::string);
        int pending_state_dialog ();
@@ -689,6 +697,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void set_denormal_model (ARDOUR::DenormalModel);
 
        void toggle_sync_order_keys ();
+       void toggle_new_plugins_active();
        void toggle_StopPluginsWithTransport();
        void toggle_DoNotRunPluginsWhileRecording();
        void toggle_VerifyRemoveLastCapture();
@@ -699,6 +708,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_GainReduceFastTransport();
        void toggle_LatchedSolo();
        void toggle_ShowSoloMutes();
+       void toggle_SoloMuteOverride();
        void toggle_LatchedRecordEnable ();
        void toggle_RegionEquivalentsOverlap ();
        void toggle_PrimaryClockDeltaEditCursor ();
@@ -706,6 +716,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_only_copy_imported_files ();
        void toggle_ShowTrackMeters ();
        void toggle_use_narrow_ms();
+       void toggle_NameNewMarkers ();
        void toggle_rubberbanding_snaps_to_grid ();
        void toggle_auto_analyse_audio ();
        void toggle_TapeMachineMode();