projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
NO-OP whitespace (updated GH PR #357)
[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 21cae9fe6e0353f17bd5faaf7a24b4c2fd072cbf..8f290444478521dfd74627105127ef8260d7a2ac 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -28,7 +28,9 @@
 
 #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"
@@ -41,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;
@@ -61,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);
@@ -71,12 +72,8 @@ AddRouteDialog::AddRouteDialog ()
        channel_combo.set_name (X_("ChannelCountSelector"));
        mode_combo.set_name (X_("ChannelCountSelector"));
 
-       refill_channel_setups ();
-       refill_route_groups ();
        refill_track_modes ();
 
-       channel_combo.set_active_text (channel_combo_strings.front());
-
        track_bus_combo.append_text (_("Audio Tracks"));
        track_bus_combo.append_text (_("MIDI Tracks"));
        track_bus_combo.append_text (_("Audio+MIDI Tracks"));
@@ -197,10 +194,10 @@ AddRouteDialog::AddRouteDialog ()
           this dialog is shown, via ::on_show()
        */
 
-       add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       add_button (Stock::ADD, RESPONSE_ACCEPT);
-       set_response_sensitive (RESPONSE_ACCEPT, true);
-       set_default_response (RESPONSE_ACCEPT);
+       add_button (_("Add and Close"), AddAndClose);
+       add_button (_("Add"), Add);
+       set_response_sensitive (AddAndClose, true);
+       set_default_response (AddAndClose);
 
        track_type_chosen ();
 }
@@ -212,7 +209,6 @@ AddRouteDialog::~AddRouteDialog ()
 void
 AddRouteDialog::channel_combo_changed ()
 {
-       maybe_update_name_template_entry ();
        refill_track_modes ();
 }
 
@@ -238,19 +234,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"));
@@ -283,6 +266,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);
@@ -292,6 +277,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:
                {
@@ -300,7 +287,7 @@ AddRouteDialog::track_type_chosen ()
                                           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);
@@ -308,6 +295,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);
@@ -317,6 +306,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);
@@ -326,6 +317,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);
@@ -334,6 +327,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;
        }
 
@@ -375,8 +370,12 @@ AddRouteDialog::refill_track_modes ()
        vector<string> s;
 
        s.push_back (_("Normal"));
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
        s.push_back (_("Non Layered"));
-       s.push_back (_("Tape"));
+#endif
+       if (!ARDOUR::Profile->get_mixbus ()) {
+               s.push_back (_("Tape"));
+       }
 
        set_popdown_strings (mode_combo, s);
        mode_combo.set_active_text (s.front());
@@ -459,6 +458,8 @@ AddRouteDialog::track_template ()
 void
 AddRouteDialog::on_show ()
 {
+       routes_spinner.grab_focus ();
+
        refill_channel_setups ();
        refill_route_groups ();
 
@@ -471,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 ();
 
@@ -534,7 +538,12 @@ AddRouteDialog::refill_channel_setups ()
        }
 
        set_popdown_strings (channel_combo, channel_combo_strings);
-       channel_combo.set_active_text (channel_combo_strings.front());
+
+       if (!channel_current_choice.empty()) {
+               channel_combo.set_active_text (channel_current_choice);
+       } else {
+               channel_combo.set_active_text (channel_combo_strings.front());
+       }
 }
 
 void
@@ -580,24 +589,41 @@ 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
+RouteDialogs::InsertAt
 AddRouteDialog::insert_at ()
 {
+       using namespace RouteDialogs;
+
        std::string str = insert_at_combo.get_active_text();
 
        if (str == _("First")) {
Unnamed repository; edit this file 'description' to name the repository.