X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.h;h=e5622db3bae2b9f712f638d336c2176db5eaf6d3;hb=7d8b93add17620135eadee5029325a3d22512b12;hp=be973095b5a343566244f6d51a1eb3975d9e939a;hpb=1067391289c0ea57b1845f7bd5bce18eb2f37ace;p=ardour.git

diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index be973095b5..e5622db3ba 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -31,8 +31,12 @@
 #include <gtkmm/button.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/comboboxtext.h>
+#include <gtkmm/textview.h>
 #include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
+#include <gtkmm/treestore.h>
 #include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
 
 #include "ardour/plugin.h"
 #include "ardour/types.h"
@@ -40,50 +44,62 @@
 
 #include "ardour_dialog.h"
 #include "instrument_selector.h"
+#include "route_dialogs.h"
 
 class Editor;
+class RouteGroupDialog;
 
 class AddRouteDialog : public ArdourDialog
 {
-  public:
+public:
 	AddRouteDialog ();
 	~AddRouteDialog ();
 
+	enum ResponseId {
+		Add,
+		AddAndClose,
+	};
+
 	enum TypeWanted {
 		AudioTrack,
 		MidiTrack,
 		MixedTrack,
 		AudioBus,
-		MidiBus
+		MidiBus,
+		VCAMaster,
 	};
-	TypeWanted type_wanted() const;
+	TypeWanted type_wanted();
 
 	ARDOUR::ChanCount channels ();
+	uint32_t channel_count ();
 	int count ();
 
 	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 ();
-	enum InsertAt {
-		BeforeSelection,
-		AfterSelection,
-		First,
-		Last
-	};
-	InsertAt insert_at();
+
+	RouteDialogs::InsertAt insert_at();
 	bool use_strict_io();
 
-  private:
+	std::string get_template_path();
+
+	void reset_name_edited () { name_edited_by_user = false; }
+
+private:
 	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 manual_label;
+	Gtk::Label add_label;
+	Gtk::Label name_label;
+	Gtk::Label group_label;
+	Gtk::Label insert_label;
+	Gtk::Label strict_io_label;
 	Gtk::Label mode_label;
 	Gtk::Label instrument_label;
 	Gtk::ComboBoxText mode_combo;
@@ -92,8 +108,6 @@ class AddRouteDialog : public ArdourDialog
 	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 ();
@@ -105,21 +119,51 @@ class AddRouteDialog : public ArdourDialog
 	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 ();
+	struct TrackTemplateColumns : public Gtk::TreeModel::ColumnRecord {
+		TrackTemplateColumns () {
+			add (name);
+			add (path);
+			add (description);
+			add (modified_with);
+		}
+
+		Gtk::TreeModelColumn<std::string> name;
+		Gtk::TreeModelColumn<std::string> path;
+		Gtk::TreeModelColumn<std::string> description;
+		Gtk::TreeModelColumn<std::string> modified_with;
+	};
+
+	TrackTemplateColumns track_template_columns;
+
+    Glib::RefPtr<Gtk::TreeStore>  trk_template_model;
+    Gtk::TreeView                 trk_template_chooser;
+
+	void trk_template_row_selected ();
 
+	Gtk::TextView trk_template_desc;
+	Gtk::Frame    trk_template_outer_frame;
+	Gtk::Frame    trk_template_desc_frame;
+
+	void reset_template_option_visibility ();
+	void new_group_dialog_finished (int, RouteGroupDialog*);
 	void on_show ();
+	void on_response (int);
 
 	struct ChannelSetup {
-	    std::string name;
-	    std::string template_path;
-	    uint32_t    channels;
+		std::string name;
+		uint32_t    channels;
 	};
 
 	typedef std::vector<ChannelSetup> ChannelSetups;
 	ChannelSetups channel_setups;
 
+	static std::vector<std::pair<std::string, std::string> > builtin_types;
 	static std::vector<std::string> channel_combo_strings;
 	static std::vector<std::string> bus_mode_strings;
+
+	bool name_edited_by_user;
+	void name_template_entry_insertion (Glib::ustring const &,int*);
+	void name_template_entry_deletion (int, int);
 };
 
 #endif /* __gtk_ardour_add_route_dialog_h__ */