Consolidate PinDialog Session/recording checks

[ardour.git] / gtk2_ardour / add_route_dialog.h

diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 20bbeeeff865f33bd181330edb46228888af28b0..e5622db3bae2b9f712f638d336c2176db5eaf6d3 100644 (file)
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -86,6 +86,8 @@ public:
 
        std::string get_template_path();
 
+       void reset_name_edited () { name_edited_by_user = false; }
+
 private:
        Gtk::Entry name_template_entry;
        Gtk::Adjustment routes_adjustment;
@@ -122,13 +124,13 @@ private:
                        add (name);
                        add (path);
                        add (description);
-                       add (created_with);
+                       add (modified_with);
                }
 
                Gtk::TreeModelColumn<std::string> name;
                Gtk::TreeModelColumn<std::string> path;
                Gtk::TreeModelColumn<std::string> description;
-               Gtk::TreeModelColumn<std::string> created_with;
+               Gtk::TreeModelColumn<std::string> modified_with;
        };
 
        TrackTemplateColumns track_template_columns;
@@ -139,6 +141,7 @@ private:
        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 ();
@@ -154,7 +157,7 @@ private:
        typedef std::vector<ChannelSetup> ChannelSetups;
        ChannelSetups channel_setups;
 
-       static std::vector<std::string> builtin_types;
+       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;