X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.h;h=1a571039260211a14e3ba2ba132f4bbd1dcb3273;hb=f66f7ba136c8588e47b3381ab07353e85f4100bf;hp=7cd3307d480b047ace20ee959effee2b491702ee;hpb=316973d7c7bc99bfef6367d42009883d0de2abbd;p=ardour.git

diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 7cd3307d48..1a57103926 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -39,8 +39,11 @@
 #include "ardour/template_utils.h"
 
 #include "ardour_dialog.h"
+#include "instrument_selector.h"
+#include "route_dialogs.h"
 
 class Editor;
+class RouteGroupDialog;
 
 class AddRouteDialog : public ArdourDialog
 {
@@ -48,25 +51,30 @@ class AddRouteDialog : public ArdourDialog
 	AddRouteDialog ();
 	~AddRouteDialog ();
 
-        enum TypeWanted { 
+	enum TypeWanted {
 		AudioTrack,
 		MidiTrack,
 		MixedTrack,
-		AudioBus
+		AudioBus,
+		MidiBus,
+		VCAMaster,
 	};
-        TypeWanted type_wanted() const;
-       
-        ARDOUR::ChanCount channels ();
+	TypeWanted type_wanted() const;
+
+	ARDOUR::ChanCount channels ();
 	int count ();
 
-        std::string name_template () const;
-        bool name_template_is_default () const;
+	std::string name_template () const;
+	bool name_template_is_default () const;
 	std::string track_template ();
 	ARDOUR::PluginInfoPtr requested_instrument ();
-	
+
 	ARDOUR::TrackMode mode();
 	ARDOUR::RouteGroup* route_group ();
 
+	RouteDialogs::InsertAt insert_at();
+	bool use_strict_io();
+
   private:
 	Gtk::Entry name_template_entry;
 	Gtk::ComboBoxText track_bus_combo;
@@ -78,7 +86,9 @@ class AddRouteDialog : public ArdourDialog
 	Gtk::Label instrument_label;
 	Gtk::ComboBoxText mode_combo;
 	Gtk::ComboBoxText route_group_combo;
-	Gtk::ComboBox     instrument_combo;
+	InstrumentSelector instrument_combo;
+	Gtk::ComboBoxText insert_at_combo;
+	Gtk::ComboBoxText strict_io_combo;
 
 	std::vector<ARDOUR::TemplateInfo> route_templates;
 
@@ -94,7 +104,7 @@ class AddRouteDialog : public ArdourDialog
 	void maybe_update_name_template_entry ();
 
 	void reset_template_option_visibility ();
-
+	void new_group_dialog_finished (int, RouteGroupDialog*);
 	void on_show ();
 
 	struct ChannelSetup {
@@ -108,21 +118,6 @@ class AddRouteDialog : public ArdourDialog
 
 	static std::vector<std::string> channel_combo_strings;
 	static std::vector<std::string> bus_mode_strings;
-
-	struct InstrumentListColumns : public Gtk::TreeModel::ColumnRecord {
-		InstrumentListColumns () {
-			add (name);
-			add (info_ptr);
-		}
-		Gtk::TreeModelColumn<std::string>  name;
-		Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> info_ptr;
-	};
-
-	Glib::RefPtr<Gtk::ListStore> instrument_list;
-	InstrumentListColumns instrument_list_columns;
-
-	void build_instrument_list ();
-	uint32_t reasonable_synth_id;
 };
 
 #endif /* __gtk_ardour_add_route_dialog_h__ */