LTC slave fix fps detection with 29.97000 option

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 22898db3725457381fc4d69b97ca755b2a7777e4..1c952324791b8e1329238119a9f13494784c9014 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -83,6 +83,7 @@ class ButtonJoiner;
 class ConnectionEditor;
 class KeyEditor;
 class LocationUIWindow;
+class MainClock;
 class Mixer_UI;
 class PublicEditor;
 class RCOptionEditor;
@@ -139,14 +140,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        ARDOUR::Session* the_session() { return _session; }
 
-       bool will_create_new_session_automatically() const {
-               return _will_create_new_session_automatically;
-       }
-
-       void set_will_create_new_session_automatically (bool yn) {
-               _will_create_new_session_automatically = yn;
-       }
-
        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);
@@ -196,15 +189,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void save_ardour_state ();
        gboolean configure_handler (GdkEventConfigure* conf);
 
-       void do_transport_locate (framepos_t, bool);
        void halt_on_xrun_message ();
        void xrun_handler (framepos_t);
        void create_xrun_marker (framepos_t);
 
        GUIObjectState* gui_object_state;
 
-       AudioClock* primary_clock;
-       AudioClock* secondary_clock;
+       MainClock* primary_clock;
+       MainClock* secondary_clock;
        void focus_on_clock ();
 
        TimeInfoBox* time_info_box;
@@ -239,6 +231,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
                session_add_midi_route (true, route_group, how_many, name_template, instrument);
        }
 
+        void session_add_mixed_track (const ARDOUR::ChanCount& input, const ARDOUR::ChanCount& output, ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template,
+                                     ARDOUR::PluginInfoPtr instrument);
+
        /*void session_add_midi_bus () {
                session_add_midi_route (false);
        }*/
@@ -251,8 +246,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void maximise_editing_space ();
        void restore_editing_space ();
 
+       void update_tearoff_visibility ();
+
        void setup_profile ();
-       void setup_theme ();
        void setup_tooltips ();
 
        void set_shuttle_fract (double);
@@ -266,7 +262,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
   protected:
        friend class PublicEditor;
 
-       void toggle_clocking ();
        void toggle_auto_play ();
        void toggle_auto_input ();
        void toggle_punch ();
@@ -289,10 +284,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ARDOUR::AudioEngine *engine;
        Gtk::Tooltips        _tooltips;
 
-       void                goto_editor_window ();
-       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 ();
@@ -300,7 +295,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        static ARDOUR_UI *theArdourUI;
 
-       void backend_audio_error (bool we_set_params, Gtk::Window* toplevel = 0);
        void startup ();
        void shutdown ();
 
@@ -508,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 ();
 
@@ -529,10 +526,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        sigc::connection point_oh_five_second_connection;
        sigc::connection point_zero_one_second_connection;
 
-       gint session_menu (GdkEventButton *);
-
-       bool _will_create_new_session_automatically;
-
        void open_session ();
        void open_recent_session ();
        void save_template ();
@@ -545,14 +538,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void set_transport_sensitivity (bool);
 
-       void remove_last_capture ();
-
        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);
        void transport_roll ();
        void transport_play_selection();
@@ -624,6 +614,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        About* about;
        Splash* splash;
+
        void pop_back_splash (Gtk::Window&);
 
        /* cleanup */
@@ -692,7 +683,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        Gtk::ToggleButton error_log_button;
 
        void loading_message (const std::string& msg);
-       void end_loading_messages ();
 
         void toggle_translations ();