remove all trace of SAE from source code.

[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 990a84ba889a40394e09bb6f3cff5600f00d9a9d..1127ab2da770312bb2eb89778c7b7905942ee292 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -81,8 +81,8 @@ AddRouteDialog::AddRouteDialog ()
        track_bus_combo.set_active (0);
 
        insert_at_combo.append_text (_("First"));
-       insert_at_combo.append_text (_("After Editor Selection"));
-       insert_at_combo.append_text (_("After Mixer Selection"));
+       insert_at_combo.append_text (_("Before Selection"));
+       insert_at_combo.append_text (_("After Selection"));
        insert_at_combo.append_text (_("Last"));
 
        insert_at_combo.set_active (1);
@@ -135,16 +135,10 @@ AddRouteDialog::AddRouteDialog ()
        table2->attach (channel_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
        ++n;
 
-       if (!ARDOUR::Profile->get_sae ()) {
-
-               /* Track mode */
-
-               mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-               table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
-               table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
-               ++n;
-
-       }
+       mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+       table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
 
        instrument_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
        table2->attach (instrument_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
@@ -323,13 +317,10 @@ void
 AddRouteDialog::refill_track_modes ()
 {
        vector<string> s;
-       
-       s.push_back (_("Normal"));
 
-       if (!ARDOUR::Profile->get_sae ()) {
-               s.push_back (_("Non Layered"));
-               s.push_back (_("Tape"));
-       }
+       s.push_back (_("Normal"));
+       s.push_back (_("Non Layered"));
+       s.push_back (_("Tape"));
 
        set_popdown_strings (mode_combo, s);
        mode_combo.set_active_text (s.front());
@@ -338,10 +329,6 @@ AddRouteDialog::refill_track_modes ()
 ARDOUR::TrackMode
 AddRouteDialog::mode ()
 {
-       if (ARDOUR::Profile->get_sae()) {
-               return ARDOUR::Normal;
-       }
-
        std::string str = mode_combo.get_active_text();
        if (str == _("Normal")) {
                return ARDOUR::Normal;
@@ -392,7 +379,7 @@ AddRouteDialog::channels ()
                ret.set (DataType::MIDI, 1);
                break;
        }
-               
+
        return ret;
 }
 
@@ -441,49 +428,47 @@ AddRouteDialog::refill_channel_setups ()
 
        ARDOUR::find_route_templates (route_templates);
 
-       if (!ARDOUR::Profile->get_sae()) {
-               if (!route_templates.empty()) {
-                       vector<string> v;
-                       for (vector<TemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
-                               chn.name = x->name;
-                               chn.channels = 0;
-                               chn.template_path = x->path;
-                               channel_setups.push_back (chn);
-                       }
+       if (!route_templates.empty()) {
+               vector<string> v;
+               for (vector<TemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
+                       chn.name = x->name;
+                       chn.channels = 0;
+                       chn.template_path = x->path;
+                       channel_setups.push_back (chn);
                }
+       }
 
-               /* clear template path for the rest */
+       /* clear template path for the rest */
 
-               chn.template_path = "";
+       chn.template_path = "";
 
-               chn.name = _("3 Channel");
-               chn.channels = 3;
-               channel_setups.push_back (chn);
+       chn.name = _("3 Channel");
+       chn.channels = 3;
+       channel_setups.push_back (chn);
 
-               chn.name = _("4 Channel");
-               chn.channels = 4;
-               channel_setups.push_back (chn);
+       chn.name = _("4 Channel");
+       chn.channels = 4;
+       channel_setups.push_back (chn);
 
-               chn.name = _("5 Channel");
-               chn.channels = 5;
-               channel_setups.push_back (chn);
+       chn.name = _("5 Channel");
+       chn.channels = 5;
+       channel_setups.push_back (chn);
 
-               chn.name = _("6 Channel");
-               chn.channels = 6;
-               channel_setups.push_back (chn);
+       chn.name = _("6 Channel");
+       chn.channels = 6;
+       channel_setups.push_back (chn);
 
-               chn.name = _("8 Channel");
-               chn.channels = 8;
-               channel_setups.push_back (chn);
+       chn.name = _("8 Channel");
+       chn.channels = 8;
+       channel_setups.push_back (chn);
 
-               chn.name = _("12 Channel");
-               chn.channels = 12;
-               channel_setups.push_back (chn);
+       chn.name = _("12 Channel");
+       chn.channels = 12;
+       channel_setups.push_back (chn);
 
-               chn.name = _("Custom");
-               chn.channels = 0;
-               channel_setups.push_back (chn);
-       }
+       chn.name = _("Custom");
+       chn.channels = 0;
+       channel_setups.push_back (chn);
 
        for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
                channel_combo_strings.push_back ((*i).name);
@@ -531,11 +516,6 @@ AddRouteDialog::group_changed ()
 {
        if (_session && route_group_combo.get_active_text () == _("New Group...")) {
                RouteGroup* g = new RouteGroup (*_session, "");
-
-               PropertyList plist;
-               plist.add (Properties::active, true);
-               g->apply_changes (plist);
-
                RouteGroupDialog d (g, true);
 
                if (d.do_run ()) {
@@ -558,10 +538,10 @@ AddRouteDialog::insert_at ()
 
        if (str == _("First")) {
                return First;
-       } else if (str == _("After Editor Selection")) {
-               return EditorSelection;
-       } else if (str == _("After Mixer Selection")){
-               return MixerSelection;
+       } else if (str == _("After Selection")) {
+               return AfterSelection;
+       } else if (str == _("Before Selection")){
+               return BeforeSelection;
        }
        return Last;
 }