Update pingback to use ArdourCurl

[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 aecff1c84526d32cb084a5cc6bdb773d27a0d546..90ccff58f77d23b7254c18085df146ebd957f3ca 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -30,6 +30,7 @@
 #include "pbd/convert.h"
 
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
 
 #include "ardour/plugin_manager.h"
 #include "ardour/profile.h"
@@ -42,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;
@@ -62,7 +63,6 @@ AddRouteDialog::AddRouteDialog ()
        , instrument_label (_("Instrument:"))
 {
        set_name ("AddRouteDialog");
-       set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
        set_position (WIN_POS_MOUSE);
@@ -235,19 +235,6 @@ AddRouteDialog::type_wanted() const
 void
 AddRouteDialog::maybe_update_name_template_entry ()
 {
-       if (
-               name_template_entry.get_text() != "" &&
-               name_template_entry.get_text() != VCA::default_name_template() &&
-               name_template_entry.get_text() != _("Audio") &&
-               name_template_entry.get_text() != _("MIDI")  &&
-               name_template_entry.get_text() != _("Audio+MIDI")  &&
-               name_template_entry.get_text() != _("Bus")) {
-               strict_io_combo.set_sensitive (false);
-               return;
-       }
-
-       strict_io_combo.set_sensitive (true);
-
        switch (type_wanted()) {
        case AudioTrack:
                name_template_entry.set_text (_("Audio"));
@@ -280,6 +267,8 @@ AddRouteDialog::track_type_chosen ()
                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);
@@ -289,6 +278,8 @@ AddRouteDialog::track_type_chosen ()
                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:
                {
@@ -305,6 +296,8 @@ AddRouteDialog::track_type_chosen ()
                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);
@@ -314,6 +307,8 @@ AddRouteDialog::track_type_chosen ()
                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);
@@ -323,6 +318,8 @@ AddRouteDialog::track_type_chosen ()
                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);
@@ -331,6 +328,8 @@ AddRouteDialog::track_type_chosen ()
                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;
        }
 
@@ -585,19 +584,34 @@ AddRouteDialog::group_changed ()
 {
        if (_session && route_group_combo.get_active_text () == _("New Group...")) {
                RouteGroup* g = new RouteGroup (*_session, "");
-               RouteGroupDialog d (g, true);
-
-               if (d.do_run ()) {
-                       delete g;
-                       route_group_combo.set_active (2);
-               } else {
-                       if (_session) {
-                               _session->add_route_group (g);
-                       }
-                       add_route_group (g);
-                       route_group_combo.set_active (3);
+               RouteGroupDialog* d = new RouteGroupDialog (g, true);
+
+               d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &AddRouteDialog::new_group_dialog_finished), d));
+               d->present();
+       }
+}
+
+void
+AddRouteDialog::new_group_dialog_finished (int r, RouteGroupDialog* d)
+{
+       if (r == RESPONSE_OK) {
+
+               if (!d->name_check()) {
+                       return;
                }
+
+               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);
 }
 
 AddRouteDialog::InsertAt