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 2b687cd11eeaa660d604a2f9ac7287ca4c127eec..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;
@@ -194,8 +195,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        GUIObjectState* gui_object_state;
 
-       AudioClock* primary_clock;
-       AudioClock* secondary_clock;
+       MainClock* primary_clock;
+       MainClock* secondary_clock;
        void focus_on_clock ();
 
        TimeInfoBox* time_info_box;
@@ -230,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);
        }*/
@@ -242,6 +246,8 @@ 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_tooltips ();
 
@@ -278,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 ();
@@ -496,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,8 +538,6 @@ 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 ();
@@ -607,6 +614,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        About* about;
        Splash* splash;
+
        void pop_back_splash (Gtk::Window&);
 
        /* cleanup */