X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.h;h=685622029516d3c8e6763f1e8f89509d5613c9a8;hb=25ec63968c0e792217a015c402ac52ae59a85e3b;hp=7af8b47d8d3a9f47a81216e24477d4cc0c2eecd5;hpb=b99b507be9cb290ff9fc2d6197af045964eb68a2;p=ardour.git

diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 7af8b47d8d..6856220295 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -29,57 +29,86 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/button.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/treemodel.h>
+#include <gtkmm/liststore.h>
 
+#include "ardour/plugin.h"
 #include "ardour/types.h"
 #include "ardour/template_utils.h"
 
 #include "ardour_dialog.h"
+#include "instrument_selector.h"
 
 class Editor;
+class RouteGroupDialog;
 
 class AddRouteDialog : public ArdourDialog
 {
   public:
-	AddRouteDialog (ARDOUR::Session &);
+	AddRouteDialog ();
 	~AddRouteDialog ();
 
-	bool track ();
-	int channels ();
+	enum TypeWanted {
+		AudioTrack,
+		MidiTrack,
+		MixedTrack,
+		AudioBus,
+		MidiBus,
+		VCAMaster,
+	};
+	TypeWanted type_wanted() const;
+
+	ARDOUR::ChanCount channels ();
 	int count ();
-	bool aux ();
 
-	std::string name_template ();
+	std::string name_template () const;
+	bool name_template_is_default () const;
 	std::string track_template ();
+	ARDOUR::PluginInfoPtr requested_instrument ();
 
-	ARDOUR::DataType type();
 	ARDOUR::TrackMode mode();
 	ARDOUR::RouteGroup* route_group ();
+	enum InsertAt {
+		BeforeSelection,
+		AfterSelection,
+		First,
+		Last
+	};
+	InsertAt insert_at();
+	bool use_strict_io();
 
   private:
-	ARDOUR::Session& _session;
 	Gtk::Entry name_template_entry;
 	Gtk::ComboBoxText track_bus_combo;
 	Gtk::Adjustment routes_adjustment;
 	Gtk::SpinButton routes_spinner;
 	Gtk::ComboBoxText channel_combo;
+	Gtk::Label configuration_label;
 	Gtk::Label mode_label;
+	Gtk::Label instrument_label;
 	Gtk::ComboBoxText mode_combo;
 	Gtk::ComboBoxText route_group_combo;
+	InstrumentSelector instrument_combo;
+	Gtk::ComboBoxText insert_at_combo;
+	Gtk::ComboBoxText strict_io_combo;
 
 	std::vector<ARDOUR::TemplateInfo> route_templates;
 
 	void track_type_chosen ();
 	void refill_channel_setups ();
 	void refill_route_groups ();
+	void refill_track_modes ();
 	void add_route_group (ARDOUR::RouteGroup *);
 	void group_changed ();
+	void channel_combo_changed ();
 	bool channel_separator (const Glib::RefPtr<Gtk::TreeModel> &m, const Gtk::TreeModel::iterator &i);
 	bool route_separator (const Glib::RefPtr<Gtk::TreeModel> &m, const Gtk::TreeModel::iterator &i);
+	void maybe_update_name_template_entry ();
 
 	void reset_template_option_visibility ();
-
+	void new_group_dialog_finished (int, RouteGroupDialog*);
 	void on_show ();
 
 	struct ChannelSetup {
@@ -92,7 +121,6 @@ class AddRouteDialog : public ArdourDialog
 	ChannelSetups channel_setups;
 
 	static std::vector<std::string> channel_combo_strings;
-	static std::vector<std::string> track_mode_strings;
 	static std::vector<std::string> bus_mode_strings;
 };