fix reversion of keyboard focus from gain display editing widget in both mixer and...

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 4d6f3391fc425b60c09fc8e1e556d93f1d9e634b..0af4cd6d2a3c78ce960b23d3b365463d73d363ee 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -140,6 +140,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        ARDOUR::Session* the_session() { return _session; }
 
+       bool get_smart_mode () const;
+       
        int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
        int  build_session_from_nsd (const std::string& session_name, const std::string& session_path);
        bool ask_about_loading_existing_session (const std::string& session_path);
@@ -259,8 +261,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void get_process_buffers ();
        void drop_process_buffers ();
 
-       void goto_editor_window ();
-       
   protected:
        friend class PublicEditor;
 
@@ -286,9 +286,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ARDOUR::AudioEngine *engine;
        Gtk::Tooltips        _tooltips;
 
-       void                goto_mixer_window ();
-       void                toggle_mixer_window ();
-       void                toggle_mixer_on_top ();
+       void goto_editor_window ();
+       void goto_mixer_window ();
+       void toggle_mixer_window ();
+       void toggle_mixer_on_top ();
 
        int  setup_windows ();
        void setup_transport ();
@@ -419,8 +420,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ArdourButton play_selection_button;
        ArdourButton rec_button;
 
-       ButtonJoiner* transport_joiner;
-
        void toggle_external_sync ();
        void toggle_time_master ();
        void toggle_video_sync ();
@@ -428,7 +427,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ShuttleControl* shuttle_box;
 
        ArdourButton auto_return_button;
-       ArdourButton auto_play_button;
+       ArdourButton follow_edits_button;
        ArdourButton auto_input_button;
        ArdourButton click_button;
        ArdourButton sync_button;
@@ -447,7 +446,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void soloing_changed (bool);
        void auditioning_changed (bool);
        void _auditioning_changed (bool);
-
+       
        bool solo_alert_press (GdkEventButton* ev);
        bool audition_alert_press (GdkEventButton* ev);
        bool feedback_alert_press (GdkEventButton *);
@@ -503,6 +502,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        Gtk::Label   disk_space_label;
        void update_disk_space ();
 
+       Gtk::Label   timecode_format_label;
+       void update_timecode_format ();
+
        Gtk::Label   cpu_load_label;
        void update_cpu_load ();
 
@@ -544,6 +546,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void transport_record (bool roll);
        void transport_roll ();
        void transport_play_selection();
+       void transport_play_preroll(); 
        void transport_forward (int option);
        void transport_rewind (int option);
        void transport_loop ();
@@ -612,6 +615,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        About* about;
        Splash* splash;
+
        void pop_back_splash (Gtk::Window&);
 
        /* cleanup */