X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=0af4cd6d2a3c78ce960b23d3b365463d73d363ee;hb=00e1b1410c98e96a283ff4f4ab87dad2f8d1e5a2;hp=b022c13ba4b6861a262b6bc93992f23bfb36b3c7;hpb=b0fdefb7af31ff6f81e0b89891c748b42c78df3d;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index b022c13ba4..0af4cd6d2a 100644
--- 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);
@@ -166,7 +168,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void new_midi_tracer_window ();
 	void toggle_route_params_window ();
 	void toggle_editing_space();
-	void toggle_editing_space_force(bool force);
 	void toggle_keep_tearoffs();
 
 	Gtk::Tooltips& tooltips() { return _tooltips; }
@@ -232,6 +233,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);
 	}*/
@@ -241,8 +245,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	gint exit_on_main_window_close (GdkEventAny *);
 
-	void maximise_editing_space (bool force);
-	void restore_editing_space (bool force);
+	void maximise_editing_space ();
+	void restore_editing_space ();
+
+	void update_tearoff_visibility ();
 
 	void setup_profile ();
 	void setup_tooltips ();
@@ -280,10 +286,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 ();
@@ -414,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 ();
@@ -423,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;
@@ -442,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 *);
@@ -498,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 ();
 
@@ -539,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 ();
@@ -607,6 +615,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	About* about;
 	Splash* splash;
+
 	void pop_back_splash (Gtk::Window&);
 
 	/* cleanup */