when calculating average slave/master delta, use absolute value.

[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 0daef1048e8b3932bfcb12676b0924b9292daa46..351022c1017b3ea575f71cc417bd80d35b420934 100644 (file)
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -68,14 +68,14 @@ public:
                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();
@@ -86,16 +86,16 @@ public:
 
        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 type_label;
        Gtk::Label name_label;
        Gtk::Label group_label;
        Gtk::Label insert_label;
@@ -108,8 +108,6 @@ private:
        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 ();
@@ -143,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 ();
@@ -152,13 +151,13 @@ private:
 
        struct ChannelSetup {
                std::string name;
-               std::string template_path;
                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;