X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=90ccff58f77d23b7254c18085df146ebd957f3ca;hb=625240fe303fcd447bf7205396cdde57918b4d0c;hp=54a1b5361da9b61e5224211697c0e1631a34b3b2;hpb=a16c7a8a906c4087fd1d1a756648ca75b7e91e78;p=ardour.git

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 54a1b5361d..90ccff58f7 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -28,19 +28,22 @@
 
 #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 "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -52,43 +55,42 @@ using namespace ARDOUR_UI_UTILS;
 std::vector<std::string> AddRouteDialog::channel_combo_strings;
 
 AddRouteDialog::AddRouteDialog ()
-	: ArdourDialog (_("Add Track or Bus"))
+	: ArdourDialog (_("Add Track/Bus/VCA"))
 	, routes_adjustment (1, 1, 128, 1, 4)
 	, routes_spinner (routes_adjustment)
 	, configuration_label (_("Configuration:"))
 	, mode_label (_("Record Mode:"))
 	, instrument_label (_("Instrument:"))
-	, strict_io (_("Strict I/O"))
 {
 	set_name ("AddRouteDialog");
-	set_modal (true);
 	set_skip_taskbar_hint (true);
 	set_resizable (false);
+	set_position (WIN_POS_MOUSE);
 
 	name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
 	// routes_spinner.set_name (X_("AddRouteDialogSpinner"));
 	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"));
 	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);
 
-	insert_at_combo.set_active (1);
+	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;
@@ -162,11 +164,18 @@ AddRouteDialog::AddRouteDialog ()
 	++n;
 
 	/* New Route's Routing is.. */
-	strict_io.set_active (Config->get_strict_io ());
-	ARDOUR_UI_UTILS::set_tooltip (strict_io,
-			_("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."));
-	table2->attach (strict_io, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
-	++n;
+
+	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);
@@ -216,26 +225,16 @@ AddRouteDialog::type_wanted() const
 		return MidiTrack;
 	} else if (str == _("Audio+MIDI Tracks")) {
 		return MixedTrack;
-	} else {
+	} else if (str == _("Audio Tracks")) {
 		return AudioTrack;
+	} else {
+		return VCAMaster;
 	}
 }
 
 void
 AddRouteDialog::maybe_update_name_template_entry ()
 {
-	if (
-		name_template_entry.get_text() != "" &&
-		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.set_sensitive (false);
-		return;
-	}
-
-	strict_io.set_sensitive (true);
-
 	switch (type_wanted()) {
 	case AudioTrack:
 		name_template_entry.set_text (_("Audio"));
@@ -250,6 +249,9 @@ AddRouteDialog::maybe_update_name_template_entry ()
 	case MidiBus:
 		name_template_entry.set_text (_("Bus"));
 		break;
+	case VCAMaster:
+		name_template_entry.set_text (VCA::default_name_template());
+		break;
 	}
 }
 
@@ -264,6 +266,9 @@ AddRouteDialog::track_type_chosen ()
 		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);
@@ -272,9 +277,12 @@ AddRouteDialog::track_type_chosen ()
 		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);
@@ -287,6 +295,9 @@ AddRouteDialog::track_type_chosen ()
 		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);
@@ -295,6 +306,20 @@ AddRouteDialog::track_type_chosen ()
 		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);
@@ -303,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;
 	}
 
@@ -324,7 +351,8 @@ AddRouteDialog::name_template_is_default() const
 	if (n == _("Audio") ||
 	    n == _("MIDI") ||
 	    n == _("Audio+MIDI") ||
-	    n == _("Bus")) {
+	    n == _("Bus") ||
+	    n == VCA::default_name_template()) {
 		return true;
 	}
 
@@ -403,6 +431,8 @@ AddRouteDialog::channels ()
 		}
 		ret.set (DataType::MIDI, 1);
 		break;
+	default:
+		break;
 	}
 
 	return ret;
@@ -437,6 +467,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 ();
 
@@ -500,7 +533,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
@@ -519,6 +557,11 @@ AddRouteDialog::route_group ()
 	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 ()
 {
@@ -541,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