X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=d98977c2707df86bc433ccb5251c3b728375592f;hb=0cf116c43a1967821293f6a4b3d9bb6fe69848eb;hp=bc63d79d807278d46b89b9a0ef2098efaafe331a;hpb=b3dc75fed3180d7265f099e0a715a6f0d678d8db;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index bc63d79d80..d98977c270 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -127,6 +127,7 @@ class MainClock;
 class Mixer_UI;
 class PublicEditor;
 class SaveAsDialog;
+class SaveTemplateDialog;
 class SessionDialog;
 class SessionOptionEditorWindow;
 class Splash;
@@ -227,12 +228,12 @@ public:
 
 	static PublicEditor* _instance;
 
-	/** Emitted frequently with the audible frame, false, and the edit point as
+	/** Emitted frequently with the audible sample, false, and the edit point as
 	 *  parameters respectively.
 	 *
 	 *  (either RapidScreenUpdate || SuperRapidScreenUpdate - user-config)
 	 */
-	static sigc::signal<void, framepos_t, bool, framepos_t> Clock;
+	static sigc::signal<void, samplepos_t, bool, samplepos_t> Clock;
 
 	static void close_all_dialogs () { CloseAllDialogs(); }
 	static sigc::signal<void> CloseAllDialogs;
@@ -248,8 +249,8 @@ public:
 	gboolean configure_handler (GdkEventConfigure* conf);
 
 	void halt_on_xrun_message ();
-	void xrun_handler (framepos_t);
-	void create_xrun_marker (framepos_t);
+	void xrun_handler (samplepos_t);
+	void create_xrun_marker (samplepos_t);
 
 	GUIObjectState* gui_object_state;
 
@@ -282,54 +283,21 @@ public:
 	void flush_videotimeline_cache (bool localcacheonly=false);
 	void export_video (bool range = false);
 
-	void session_add_vca (std::string const &, uint32_t);
-
 	void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order);
-	void session_add_audio_track (
-		int input_channels,
-		int32_t output_channels,
-		ARDOUR::TrackMode mode,
-		ARDOUR::RouteGroup* route_group,
-		uint32_t how_many,
-		std::string const & name_template,
-		bool strict_io,
-		ARDOUR::PresentationInfo::order_t order
-		) {
-		session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many, name_template, strict_io, order);
-	}
-
-	void session_add_audio_bus (
-			int input_channels,
-			int32_t output_channels,
-			ARDOUR::RouteGroup* route_group,
-			uint32_t how_many,
-			std::string const & name_template,
-			bool strict_io,
-			ARDOUR::PresentationInfo::order_t order
-			) {
-		session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many, name_template, strict_io, order);
-	}
-
-	void session_add_midi_track (
-			ARDOUR::RouteGroup* route_group,
-			uint32_t how_many,
-			std::string const & name_template,
-			bool strict_io,
-			ARDOUR::PluginInfoPtr instrument,
-			ARDOUR::Plugin::PresetRecord* preset,
-			ARDOUR::PresentationInfo::order_t order
-		) {
-		session_add_midi_route (true, route_group, how_many, name_template, strict_io, instrument, preset, order);
-	}
-
-	void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, uint32_t, std::string const &, bool,
+
+	void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*,
+	                              uint32_t, std::string const &, bool strict_io,
 	                              ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset,
 	                              ARDOUR::PresentationInfo::order_t order);
-	void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset,
+
+	void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool strict_io,
+	                           ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset,
 	                           ARDOUR::PresentationInfo::order_t order);
+
 	void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool,
 	                             ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*,
 	                             ARDOUR::PresentationInfo::order_t order);
+
 	void display_insufficient_ports_message ();
 
 	void attach_to_engine ();
@@ -380,6 +348,8 @@ public:
 
 	ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt);
 
+	std::map<std::string, std::string> route_setup_info (const std::string& script_path);
+
 protected:
 	friend class PublicEditor;
 
@@ -467,7 +437,7 @@ private:
 	void         start_clocking ();
 	void         stop_clocking ();
 
-	void update_transport_clocks (framepos_t pos);
+	void update_transport_clocks (samplepos_t pos);
 	void record_state_changed ();
 
 	std::list<MidiTracer*> _midi_tracer_windows;
@@ -475,7 +445,7 @@ private:
 	/* Transport Control */
 
 	Gtk::Table               transport_table;
-	Gtk::Frame               transport_frame;
+	Gtk::Frame               transport_sample;
 	Gtk::HBox                transport_hbox;
 
 	ArdourWidgets::ArdourVSpacer* secondary_clock_spacer;
@@ -634,7 +604,7 @@ private:
 	void update_buffer_load ();
 
 	Gtk::Label   sample_rate_label;
-	void update_sample_rate (ARDOUR::framecnt_t);
+	void update_sample_rate (ARDOUR::samplecnt_t);
 
 	Gtk::Label    format_label;
 	void update_format ();
@@ -652,11 +622,12 @@ private:
 
 	void open_session ();
 	void open_recent_session ();
-	bool process_save_template_prompter (ArdourWidgets::Prompter& prompter);
+	void save_template_dialog_response (int response, SaveTemplateDialog* d);
 	void save_template ();
 	void manage_templates ();
 
 	void meta_session_setup (const std::string& script_path);
+	void meta_route_setup (const std::string& script_path);
 
 	void edit_metadata ();
 	void import_metadata ();
@@ -806,8 +777,8 @@ private:
 
 	void session_dialog (std::string);
 	int pending_state_dialog ();
-	int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
-	void sr_mismatch_message (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
+	int sr_mismatch_dialog (ARDOUR::samplecnt_t, ARDOUR::samplecnt_t);
+	void sr_mismatch_message (ARDOUR::samplecnt_t, ARDOUR::samplecnt_t);
 
 	Gtk::MenuItem* jack_disconnect_item;
 	Gtk::MenuItem* jack_reconnect_item;