NO-OP whitespace (updated GH PR #357)
[ardour.git] / gtk2_ardour / add_route_dialog.cc
index 4ac34fa637423fb459e543c175ccdc26004fb7ac..8f290444478521dfd74627105127ef8260d7a2ac 100644 (file)
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/messagedialog.h>
 #include <gtkmm/separator.h>
 #include <gtkmm/table.h>
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
+
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+
+#include "ardour/plugin_manager.h"
 #include "ardour/profile.h"
 #include "ardour/template_utils.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
+#include "ardour/vca.h"
 
 #include "utils.h"
 #include "add_route_dialog.h"
 #include "route_group_dialog.h"
-#include "i18n.h"
+#include "tooltips.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
-using namespace sigc;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
-static const char* track_mode_names[] = {
-       N_("Normal"),
-       N_("Non Layered"),
-       N_("Tape"),
-       0
-};
+std::vector<std::string> AddRouteDialog::channel_combo_strings;
 
-AddRouteDialog::AddRouteDialog (Session & s)
-       : ArdourDialog (X_("add route dialog"))
-       , _session (s)
+AddRouteDialog::AddRouteDialog ()
+       : ArdourDialog (_("Add Track/Bus/VCA"))
        , routes_adjustment (1, 1, 128, 1, 4)
        , routes_spinner (routes_adjustment)
-       , track_mode_label (_("Track mode:"))
+       , configuration_label (_("Configuration:"))
+       , mode_label (_("Record Mode:"))
+       , instrument_label (_("Instrument:"))
 {
-       if (track_mode_strings.empty()) {
-               track_mode_strings = I18N (track_mode_names);
-
-               if (ARDOUR::Profile->get_sae()) {
-                       /* remove all but the first track mode (Normal) */
-
-                       while (track_mode_strings.size() > 1) {
-                               track_mode_strings.pop_back();
-                       }
-               }
-       }
-
        set_name ("AddRouteDialog");
-       set_position (Gtk::WIN_POS_MOUSE);
-       set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
-
-       set_title (_("Add Track/Bus"));
+       set_position (WIN_POS_MOUSE);
 
        name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
-       routes_spinner.set_name (X_("AddRouteDialogSpinner"));
+       // routes_spinner.set_name (X_("AddRouteDialogSpinner"));
        channel_combo.set_name (X_("ChannelCountSelector"));
-       track_mode_combo.set_name (X_("ChannelCountSelector"));
-
-       refill_channel_setups ();
-       refill_route_groups ();
-       set_popdown_strings (track_mode_combo, track_mode_strings, true);
+       mode_combo.set_name (X_("ChannelCountSelector"));
 
-       channel_combo.set_active_text (channel_combo_strings.front());
-       track_mode_combo.set_active_text (track_mode_strings.front());
+       refill_track_modes ();
 
-       track_bus_combo.append_text (_("tracks"));
-       track_bus_combo.append_text (_("busses"));
+       track_bus_combo.append_text (_("Audio Tracks"));
+       track_bus_combo.append_text (_("MIDI Tracks"));
+       track_bus_combo.append_text (_("Audio+MIDI Tracks"));
+       track_bus_combo.append_text (_("Audio Busses"));
+       track_bus_combo.append_text (_("MIDI Busses"));
+       track_bus_combo.append_text (_("VCA Masters"));
        track_bus_combo.set_active (0);
 
+       insert_at_combo.append_text (_("First"));
+       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 (3);
+
+       strict_io_combo.append_text (_("Flexible-I/O"));
+       strict_io_combo.append_text (_("Strict-I/O"));
+       strict_io_combo.set_active (Config->get_strict_io () ? 1 : 0);
+
        VBox* vbox = manage (new VBox);
        Gtk::Label* l;
 
@@ -129,37 +126,67 @@ AddRouteDialog::AddRouteDialog (Session & s)
        l->set_padding (8, 0);
        table2->attach (*l, 0, 1, 0, 3, Gtk::FILL, Gtk::FILL, 0, 0);
 
-       /* Route configuration */
+       int n = 0;
 
-       l = manage (new Label (_("Configuration:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
-       table2->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
-       table2->attach (channel_combo, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+       l = manage (new Label (_("Name:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+       table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+       table2->attach (name_template_entry, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
 
-       if (!ARDOUR::Profile->get_sae ()) {
+       /* Route configuration */
 
-               /* Track mode */
+       configuration_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+       table2->attach (configuration_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+       table2->attach (channel_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
 
-               track_mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-               table2->attach (track_mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
-               table2->attach (track_mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+       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);
+       table2->attach (instrument_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
 
-       /* Group choise */
+       /* Group choice */
 
        l = manage (new Label (_("Group:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
-       table2->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0);
-       table2->attach (route_group_combo, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+       table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+       table2->attach (route_group_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
+
+       /* New route will be inserted at.. */
+       l = manage (new Label (_("Insert:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+       table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+       table2->attach (insert_at_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+       ++n;
+
+       /* New Route's Routing is.. */
+
+       if (Profile->get_mixbus ()) {
+               strict_io_combo.set_active (1);
+       } else {
+               l = manage (new Label (_("Output Ports:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+               table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+               table2->attach (strict_io_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+
+               ARDOUR_UI_UTILS::set_tooltip (strict_io_combo,
+                               _("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
+               ++n;
+       }
 
        options_box->pack_start (*table2, false, true);
        vbox->pack_start (*options_box, false, true);
 
        get_vbox()->pack_start (*vbox, false, false);
 
-       track_bus_combo.signal_changed().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen));
-       channel_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::channel_separator));
-       route_group_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::route_separator));
-       route_group_combo.signal_changed ().connect (mem_fun (*this, &AddRouteDialog::group_changed));
+       track_bus_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::track_type_chosen));
+       channel_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::channel_combo_changed));
+       channel_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::channel_separator));
+       route_group_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::route_separator));
+       route_group_combo.signal_changed ().connect (sigc::mem_fun (*this, &AddRouteDialog::group_changed));
 
        show_all_children ();
 
@@ -167,8 +194,10 @@ AddRouteDialog::AddRouteDialog (Session & s)
           this dialog is shown, via ::on_show()
        */
 
-       add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       add_button (Stock::ADD, RESPONSE_ACCEPT);
+       add_button (_("Add and Close"), AddAndClose);
+       add_button (_("Add"), Add);
+       set_response_sensitive (AddAndClose, true);
+       set_default_response (AddAndClose);
 
        track_type_chosen ();
 }
@@ -178,51 +207,184 @@ AddRouteDialog::~AddRouteDialog ()
 }
 
 void
-AddRouteDialog::track_type_chosen ()
+AddRouteDialog::channel_combo_changed ()
 {
-       track_mode_label.set_sensitive (track ());
-       track_mode_combo.set_sensitive (track ());
+       refill_track_modes ();
 }
 
-bool
-AddRouteDialog::track ()
+AddRouteDialog::TypeWanted
+AddRouteDialog::type_wanted() const
 {
-       return track_bus_combo.get_active_row_number () == 0;
+       std::string str = track_bus_combo.get_active_text();
+       if (str == _("Audio Busses")) {
+               return AudioBus;
+       } else if (str == _("MIDI Busses")){
+               return MidiBus;
+       } else if (str == _("MIDI Tracks")){
+               return MidiTrack;
+       } else if (str == _("Audio+MIDI Tracks")) {
+               return MixedTrack;
+       } else if (str == _("Audio Tracks")) {
+               return AudioTrack;
+       } else {
+               return VCAMaster;
+       }
 }
 
-ARDOUR::DataType
-AddRouteDialog::type ()
+void
+AddRouteDialog::maybe_update_name_template_entry ()
 {
-       // FIXME: ew
+       switch (type_wanted()) {
+       case AudioTrack:
+               name_template_entry.set_text (_("Audio"));
+               break;
+       case MidiTrack:
+               name_template_entry.set_text (_("MIDI"));
+               break;
+       case MixedTrack:
+               name_template_entry.set_text (_("Audio+MIDI"));
+               break;
+       case AudioBus:
+       case MidiBus:
+               name_template_entry.set_text (_("Bus"));
+               break;
+       case VCAMaster:
+               name_template_entry.set_text (VCA::default_name_template());
+               break;
+       }
+}
 
-       const string str = channel_combo.get_active_text();
-       if (str == _("MIDI")) {
-               return ARDOUR::DataType::MIDI;
-       } else {
-               return ARDOUR::DataType::AUDIO;
+void
+AddRouteDialog::track_type_chosen ()
+{
+       switch (type_wanted()) {
+       case AudioTrack:
+               mode_combo.set_sensitive (true);
+               channel_combo.set_sensitive (true);
+               instrument_combo.set_sensitive (false);
+               configuration_label.set_sensitive (true);
+               mode_label.set_sensitive (true);
+               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);
+               mode_combo.set_sensitive (false);
+               instrument_combo.set_sensitive (true);
+               configuration_label.set_sensitive (false);
+               mode_label.set_sensitive (false);
+               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:
+               {
+                       MessageDialog msg (_("Audio+MIDI tracks are intended for use <b>ONLY</b> with plugins that use both audio and MIDI input data\n\n"
+                                            "If you do not plan to use such a plugin, then use a normal audio or MIDI track instead."),
+                                          true, MESSAGE_INFO, BUTTONS_OK, true);
+                       msg.set_position (WIN_POS_MOUSE);
+                       msg.run ();
+               }
+               channel_combo.set_sensitive (true);
+               mode_combo.set_sensitive (true);
+               instrument_combo.set_sensitive (true);
+               configuration_label.set_sensitive (true);
+               mode_label.set_sensitive (true);
+               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);
+               channel_combo.set_sensitive (true);
+               instrument_combo.set_sensitive (false);
+               configuration_label.set_sensitive (true);
+               mode_label.set_sensitive (true);
+               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);
+               channel_combo.set_sensitive (false);
+               instrument_combo.set_sensitive (false);
+               configuration_label.set_sensitive (false);
+               mode_label.set_sensitive (false);
+               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);
+               channel_combo.set_sensitive (false);
+               instrument_combo.set_sensitive (true);
+               configuration_label.set_sensitive (false);
+               mode_label.set_sensitive (true);
+               instrument_label.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
+               break;
        }
+
+       maybe_update_name_template_entry ();
 }
 
+
 string
-AddRouteDialog::name_template ()
+AddRouteDialog::name_template () const
 {
        return name_template_entry.get_text ();
 }
 
+bool
+AddRouteDialog::name_template_is_default() const
+{
+       string n = name_template();
+
+       if (n == _("Audio") ||
+           n == _("MIDI") ||
+           n == _("Audio+MIDI") ||
+           n == _("Bus") ||
+           n == VCA::default_name_template()) {
+               return true;
+       }
+
+       return false;
+}
+
 int
 AddRouteDialog::count ()
 {
        return (int) floor (routes_adjustment.get_value ());
 }
 
-ARDOUR::TrackMode
-AddRouteDialog::mode ()
+void
+AddRouteDialog::refill_track_modes ()
 {
-       if (ARDOUR::Profile->get_sae()) {
-               return ARDOUR::Normal;
+       vector<string> s;
+
+       s.push_back (_("Normal"));
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
+       s.push_back (_("Non Layered"));
+#endif
+       if (!ARDOUR::Profile->get_mixbus ()) {
+               s.push_back (_("Tape"));
        }
 
-       Glib::ustring str = track_mode_combo.get_active_text();
+       set_popdown_strings (mode_combo, s);
+       mode_combo.set_active_text (s.front());
+}
+
+ARDOUR::TrackMode
+AddRouteDialog::mode ()
+{
+       std::string str = mode_combo.get_active_text();
        if (str == _("Normal")) {
                return ARDOUR::Normal;
        } else if (str == _("Non Layered")){
@@ -232,24 +394,51 @@ AddRouteDialog::mode ()
        } else {
                fatal << string_compose (X_("programming error: unknown track mode in add route dialog combo = %1"), str)
                      << endmsg;
-               /*NOTREACHED*/
+               abort(); /*NOTREACHED*/
        }
        /* keep gcc happy */
        return ARDOUR::Normal;
 }
 
-int
+ChanCount
 AddRouteDialog::channels ()
 {
-       string str = channel_combo.get_active_text();
-
-       for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
-               if (str == (*i).name) {
-                       return (*i).channels;
+       ChanCount ret;
+       string str;
+       switch (type_wanted()) {
+       case AudioTrack:
+       case AudioBus:
+               str = channel_combo.get_active_text();
+               for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
+                       if (str == (*i).name) {
+                               ret.set (DataType::AUDIO, (*i).channels);
+                               break;
+                       }
                }
+               ret.set (DataType::MIDI, 0);
+               break;
+
+       case MidiBus:
+       case MidiTrack:
+               ret.set (DataType::AUDIO, 0);
+               ret.set (DataType::MIDI, 1);
+               break;
+
+       case MixedTrack:
+               str = channel_combo.get_active_text();
+               for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
+                       if (str == (*i).name) {
+                               ret.set (DataType::AUDIO, (*i).channels);
+                               break;
+                       }
+               }
+               ret.set (DataType::MIDI, 1);
+               break;
+       default:
+               break;
        }
 
-       return 0;
+       return ret;
 }
 
 string
@@ -269,6 +458,8 @@ AddRouteDialog::track_template ()
 void
 AddRouteDialog::on_show ()
 {
+       routes_spinner.grab_focus ();
+
        refill_channel_setups ();
        refill_route_groups ();
 
@@ -281,6 +472,9 @@ AddRouteDialog::refill_channel_setups ()
        ChannelSetup chn;
 
        route_templates.clear ();
+
+       string channel_current_choice = channel_combo.get_active_text();
+
        channel_combo_strings.clear ();
        channel_setups.clear ();
 
@@ -295,65 +489,61 @@ AddRouteDialog::refill_channel_setups ()
        chn.name = "separator";
        channel_setups.push_back (chn);
 
-       chn.name = X_("MIDI");
-       chn.channels = 0;
-       channel_setups.push_back (chn);
-
-       chn.name = "separator";
-       channel_setups.push_back (chn);
-
        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 = X_("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);
        }
 
-       set_popdown_strings (channel_combo, channel_combo_strings, true);
-       channel_combo.set_active_text (channel_combo_strings.front());
+       set_popdown_strings (channel_combo, channel_combo_strings);
+
+       if (!channel_current_choice.empty()) {
+               channel_combo.set_active_text (channel_current_choice);
+       } else {
+               channel_combo.set_active_text (channel_combo_strings.front());
+       }
 }
 
 void
@@ -365,24 +555,31 @@ AddRouteDialog::add_route_group (RouteGroup* g)
 RouteGroup*
 AddRouteDialog::route_group ()
 {
-       if (route_group_combo.get_active_row_number () == 2) {
+       if (!_session || route_group_combo.get_active_row_number () == 2) {
                return 0;
        }
 
-       return _session.route_group_by_name (route_group_combo.get_active_text());
+       return _session->route_group_by_name (route_group_combo.get_active_text());
+}
+
+bool
+AddRouteDialog::use_strict_io() {
+       return strict_io_combo.get_active_row_number () == 1;
 }
 
 void
 AddRouteDialog::refill_route_groups ()
 {
        route_group_combo.clear ();
-       route_group_combo.append_text (_("New group..."));
+       route_group_combo.append_text (_("New Group..."));
 
        route_group_combo.append_text ("separator");
 
-       route_group_combo.append_text (_("No group"));
+       route_group_combo.append_text (_("No Group"));
 
-       _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group));
+       if (_session) {
+               _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group));
+       }
 
        route_group_combo.set_active (2);
 }
@@ -390,22 +587,53 @@ AddRouteDialog::refill_route_groups ()
 void
 AddRouteDialog::group_changed ()
 {
-       if (route_group_combo.get_active_text () == _("New group...")) {
-               RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active);
+       if (_session && route_group_combo.get_active_text () == _("New Group...")) {
+               RouteGroup* g = new RouteGroup (*_session, "");
+               RouteGroupDialog* d = new RouteGroupDialog (g, true);
+
+               d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &AddRouteDialog::new_group_dialog_finished), d));
+               d->present();
+       }
+}
 
-               RouteGroupDialog d (g, Gtk::Stock::NEW);
-               int const r = d.do_run ();
+void
+AddRouteDialog::new_group_dialog_finished (int r, RouteGroupDialog* d)
+{
+       if (r == RESPONSE_OK) {
 
-               if (r == Gtk::RESPONSE_OK) {
-                       _session.add_route_group (g);
-                       add_route_group (g);
-                       route_group_combo.set_active (3);
-               } else {
-                       delete g;
+               if (!d->name_check()) {
+                       return;
+               }
 
-                       route_group_combo.set_active (2);
+               if (_session) {
+                       _session->add_route_group (d->group());
                }
+
+               add_route_group (d->group());
+               route_group_combo.set_active (3);
+       } else {
+               delete d->group ();
+               route_group_combo.set_active (2);
        }
+
+       delete_when_idle (d);
+}
+
+RouteDialogs::InsertAt
+AddRouteDialog::insert_at ()
+{
+       using namespace RouteDialogs;
+
+       std::string str = insert_at_combo.get_active_text();
+
+       if (str == _("First")) {
+               return First;
+       } else if (str == _("After Selection")) {
+               return AfterSelection;
+       } else if (str == _("Before Selection")){
+               return BeforeSelection;
+       }
+       return Last;
 }
 
 bool
@@ -424,3 +652,8 @@ AddRouteDialog::route_separator (const Glib::RefPtr<Gtk::TreeModel> &, const Gtk
        return route_group_combo.get_active_text () == "separator";
 }
 
+PluginInfoPtr
+AddRouteDialog::requested_instrument ()
+{
+       return instrument_combo.selected_instrument();
+}