Sanitize "well-known" ctrl API

[ardour.git] / gtk2_ardour / add_route_dialog.cc

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index e48a8fa99af50321743fb190110b7457756b36fc..5871712800dfcf80585e742e88be3f606156af6c 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -43,7 +43,7 @@
 #include "add_route_dialog.h"
 #include "route_group_dialog.h"
 #include "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -209,7 +209,6 @@ AddRouteDialog::~AddRouteDialog ()
 void
 AddRouteDialog::channel_combo_changed ()
 {
-       maybe_update_name_template_entry ();
        refill_track_modes ();
 }
 
@@ -268,6 +267,7 @@ AddRouteDialog::track_type_chosen ()
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (true);
                strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case MidiTrack:
                channel_combo.set_sensitive (false);
@@ -278,6 +278,7 @@ AddRouteDialog::track_type_chosen ()
                instrument_label.set_sensitive (true);
                route_group_combo.set_sensitive (true);
                strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case MixedTrack:
                {
@@ -295,6 +296,7 @@ AddRouteDialog::track_type_chosen ()
                instrument_label.set_sensitive (true);
                route_group_combo.set_sensitive (true);
                strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case AudioBus:
                mode_combo.set_sensitive (false);
@@ -305,6 +307,7 @@ AddRouteDialog::track_type_chosen ()
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (true);
                strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case VCAMaster:
                mode_combo.set_sensitive (false);
@@ -315,6 +318,7 @@ AddRouteDialog::track_type_chosen ()
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (false);
                strict_io_combo.set_sensitive (false);
+               insert_at_combo.set_sensitive (false);
                break;
        case MidiBus:
                mode_combo.set_sensitive (false);
@@ -324,6 +328,7 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (true);
                instrument_label.set_sensitive (true);
                strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        }
 
@@ -365,8 +370,13 @@ AddRouteDialog::refill_track_modes ()
        vector<string> s;
 
        s.push_back (_("Normal"));
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
        s.push_back (_("Non Layered"));
+#endif
        s.push_back (_("Tape"));
+       if (!ARDOUR::Profile->get_mixbus ()) {
+               s.push_back (_("Tape"));
+       }
 
        set_popdown_strings (mode_combo, s);
        mode_combo.set_active_text (s.front());
@@ -449,6 +459,8 @@ AddRouteDialog::track_template ()
 void
 AddRouteDialog::on_show ()
 {
+       routes_spinner.grab_focus ();
+
        refill_channel_setups ();
        refill_route_groups ();
 
@@ -608,9 +620,11 @@ AddRouteDialog::new_group_dialog_finished (int r, RouteGroupDialog* d)
        delete_when_idle (d);
 }
 
-AddRouteDialog::InsertAt
+RouteDialogs::InsertAt
 AddRouteDialog::insert_at ()
 {
+       using namespace RouteDialogs;
+
        std::string str = insert_at_combo.get_active_text();
 
        if (str == _("First")) {