X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=e48a8fa99af50321743fb190110b7457756b36fc;hb=540827880248eb8ae7fb39f466dbd94e4ce72cc8;hp=0a146470022cb70489bd39c080cd7811685f906d;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 0a14647002..e48a8fa99a 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -28,17 +28,21 @@ #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" using namespace Gtk; @@ -51,7 +55,7 @@ using namespace ARDOUR_UI_UTILS; std::vector 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:")) @@ -59,33 +63,34 @@ AddRouteDialog::AddRouteDialog () , instrument_label (_("Instrument:")) { 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 (_("Busses")); + 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; @@ -135,16 +140,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); @@ -164,6 +163,20 @@ AddRouteDialog::AddRouteDialog () 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); @@ -204,29 +217,24 @@ AddRouteDialog::TypeWanted AddRouteDialog::type_wanted() const { std::string str = track_bus_combo.get_active_text(); - if (str == _("Busses")) { + 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 { + } 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")) { - return; - } - switch (type_wanted()) { case AudioTrack: name_template_entry.set_text (_("Audio")); @@ -238,8 +246,12 @@ AddRouteDialog::maybe_update_name_template_entry () 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; } } @@ -254,6 +266,8 @@ 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); break; case MidiTrack: channel_combo.set_sensitive (false); @@ -262,9 +276,11 @@ 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); break; case MixedTrack: - { + { MessageDialog msg (_("Audio+MIDI tracks are intended for use ONLY 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); @@ -277,6 +293,8 @@ 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); break; case AudioBus: mode_combo.set_sensitive (false); @@ -285,6 +303,27 @@ 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); + 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); + 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); break; } @@ -306,7 +345,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; } @@ -325,11 +365,8 @@ AddRouteDialog::refill_track_modes () vector s; s.push_back (_("Normal")); - - if (!ARDOUR::Profile->get_sae ()) { - s.push_back (_("Non Layered")); - s.push_back (_("Tape")); - } + s.push_back (_("Non Layered")); + s.push_back (_("Tape")); set_popdown_strings (mode_combo, s); mode_combo.set_active_text (s.front()); @@ -338,10 +375,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; @@ -376,6 +409,7 @@ AddRouteDialog::channels () ret.set (DataType::MIDI, 0); break; + case MidiBus: case MidiTrack: ret.set (DataType::AUDIO, 0); ret.set (DataType::MIDI, 1); @@ -391,6 +425,8 @@ AddRouteDialog::channels () } ret.set (DataType::MIDI, 1); break; + default: + break; } return ret; @@ -425,6 +461,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 (); @@ -441,56 +480,59 @@ AddRouteDialog::refill_channel_setups () ARDOUR::find_route_templates (route_templates); - if (!ARDOUR::Profile->get_sae()) { - if (!route_templates.empty()) { - vector v; - for (vector::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 v; + for (vector::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); } 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 @@ -509,6 +551,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 () { @@ -531,19 +578,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