Small cleanups to port matrix context menu.

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 7253f58031c65acfffafad4eec63ed378aa299ec..4d8d057460bfee2441d1be4881e223ece0590f68 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -75,7 +75,7 @@ class BundleManager;
 class ConnectionEditor;
 class KeyEditor;
 class Keyboard;
-class LocationUI;
+class LocationUIWindow;
 class Mixer_UI;
 class PublicEditor;
 class RCOptionEditor;
@@ -282,7 +282,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void update_autosave();
        sigc::connection _autosave_connection;
 
-       void queue_transport_change ();
        void map_transport_state ();
        int32_t do_engine_start ();
 
@@ -386,9 +385,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        BindableButton play_selection_button;
        BindableButton rec_button;
 
-       Gtk::ComboBoxText sync_option_combo;
-
-       void sync_option_changed ();
+       void toggle_external_sync ();
        void toggle_time_master ();
        void toggle_video_sync ();
 
@@ -428,6 +425,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtkmm2ext::StatefulToggleButton auto_input_button;
        Gtkmm2ext::StatefulToggleButton click_button;
        Gtkmm2ext::StatefulToggleButton time_master_button;
+       Gtkmm2ext::StatefulToggleButton sync_button;
 
        Gtk::ToggleButton auditioning_alert_button;
        Gtk::ToggleButton solo_alert_button;
@@ -435,6 +433,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::VBox alert_box;
 
        void solo_blink (bool);
+       void sync_blink (bool);
        void audition_blink (bool);
 
        void soloing_changed (bool);
@@ -548,11 +547,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void transport_forward (int option);
        void transport_rewind (int option);
        void transport_loop ();
-
-       void transport_rolling ();
-       void transport_rewinding ();
-       void transport_forwarding ();
-       void transport_stopped ();
+       void toggle_roll (bool with_abort, bool roll_out_of_bounded_mode);
 
        bool _session_is_new;
        void connect_to_session (ARDOUR::Session *);
@@ -577,9 +572,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        BundleManager *bundle_manager;
        void create_bundle_manager ();
 
-       LocationUI *location_ui;
-       int         create_location_ui ();
-       void        handle_locations_change (ARDOUR::Location*);
+       LocationUIWindow *location_ui;
+       int               create_location_ui ();
+       void              handle_locations_change (ARDOUR::Location*);
 
        static UIConfiguration *ui_config;
        ThemeManager *theme_manager;
@@ -676,7 +671,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void toggle_use_osc ();
 
-       void mtc_port_changed ();
        void parameter_changed (std::string);
 
        bool first_idle ();