X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=650a371bd6ddaaf3726e2a8bcf3fe527fef9105a;hb=c55f3dcb3c901db64c45bd8f8dce880b4c2cd047;hp=20da63689fb6058f98ca5e24272c237d9c173df5;hpb=56033fe65854ce6360288269a84ec55820c6f548;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 20da63689f..650a371bd6 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -1,19 +1,19 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 Paul Davis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -40,48 +40,20 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -static const char* channel_setup_names[] = { - N_("Mono"), - N_("Stereo"), - N_("3 Channels"), - N_("4 Channels"), - N_("6 Channels"), - N_("8 Channels"), - N_("Manual Setup"), - 0 -}; - static const char* track_mode_names[] = { N_("Normal"), N_("Tape"), 0 }; -static vector channel_combo_strings; -static vector track_mode_strings; - AddRouteDialog::AddRouteDialog () : Dialog (_("ardour: add track/bus")), track_button (_("Tracks")), bus_button (_("Busses")), - template_button (_("Using this template:")), routes_adjustment (1, 1, 128, 1, 4), routes_spinner (routes_adjustment) { - if (channel_combo_strings.empty()) { - channel_combo_strings = I18N (channel_setup_names); - - if (ARDOUR::Profile->get_sae()) { - /* remove all but the first two (Mono & Stereo) */ - - while (track_mode_strings.size() > 2) { - track_mode_strings.pop_back(); - } - } - - } - if (track_mode_strings.empty()) { track_mode_strings = I18N (track_mode_names); @@ -102,12 +74,10 @@ AddRouteDialog::AddRouteDialog () name_template_entry.set_name ("AddRouteDialogNameTemplateEntry"); track_button.set_name ("AddRouteDialogRadioButton"); bus_button.set_name ("AddRouteDialogRadioButton"); - template_button.set_name ("AddRouteDialogRadioButton"); routes_spinner.set_name ("AddRouteDialogSpinner"); RadioButton::Group g = track_button.get_group(); bus_button.set_group (g); - template_button.set_group (g); track_button.set_active (true); /* add */ @@ -123,33 +93,6 @@ AddRouteDialog::AddRouteDialog () hbox2->set_border_width (6); hbox2->pack_start (*hbox1, PACK_EXPAND_WIDGET); - /* templates */ - - hbox3 = new HBox; - hbox3->set_spacing (6); - hbox3->set_border_width (6); - hbox3->pack_start (template_button, PACK_SHRINK); - - hbox9 = new HBox; - hbox9->set_spacing (6); - hbox9->set_border_width (6); - hbox9->pack_start (track_template_combo, PACK_EXPAND_WIDGET); - - /* separator */ - - hbox4 = new HBox; - hbox4->set_spacing (6); - Label* label2 = manage (new Label (_("OR"))); - hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET); - hbox4->pack_start (*label2, false, false); - hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET); - - /* we need more control over the visibility of these boxes */ - /* - hbox3->set_no_show_all (true); - hbox9->set_no_show_all (true); - hbox4->set_no_show_all (true); - */ /* track/bus choice & modes */ HBox* hbox5 = manage (new HBox); @@ -157,17 +100,17 @@ AddRouteDialog::AddRouteDialog () hbox5->pack_start (track_button, PACK_EXPAND_PADDING); hbox5->pack_start (bus_button, PACK_EXPAND_PADDING); - set_popdown_strings (channel_combo, channel_combo_strings); - set_popdown_strings (track_mode_combo, track_mode_strings); - channel_combo.set_active_text (channel_combo_strings.front()); channel_combo.set_name (X_("ChannelCountSelector")); + track_mode_combo.set_name (X_("ChannelCountSelector")); - track_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - bus_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - template_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); + refill_channel_setups (); + set_popdown_strings (track_mode_combo, track_mode_strings, true); + channel_combo.set_active_text (channel_combo_strings.front()); track_mode_combo.set_active_text (track_mode_strings.front()); - track_mode_combo.set_name (X_("ChannelCountSelector")); + + track_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); + bus_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); VBox* vbox1 = manage (new VBox); vbox1->set_spacing (6); @@ -182,16 +125,13 @@ AddRouteDialog::AddRouteDialog () vbox1->pack_start (*frame1, PACK_SHRINK); if (!ARDOUR::Profile->get_sae()) { - vbox1->pack_start (*frame2, PACK_SHRINK); + vbox1->pack_start (*frame2, PACK_SHRINK); } get_vbox()->set_spacing (6); get_vbox()->set_border_width (6); get_vbox()->pack_start (*hbox2, PACK_SHRINK); - get_vbox()->pack_start (*hbox3, PACK_SHRINK); - get_vbox()->pack_start (*hbox9, PACK_SHRINK); - get_vbox()->pack_start (*hbox4, PACK_SHRINK); get_vbox()->pack_start (*vbox1, PACK_SHRINK); get_vbox()->show_all (); @@ -213,19 +153,11 @@ AddRouteDialog::~AddRouteDialog () void AddRouteDialog::track_type_chosen () { - if (template_button.get_active()) { - track_mode_combo.set_sensitive (false); - channel_combo.set_sensitive (false); - track_template_combo.set_sensitive (true); - } else { - track_template_combo.set_sensitive (false); - channel_combo.set_sensitive (true); - if (track_button.get_active()) { - track_mode_combo.set_sensitive (true); - } else { - track_mode_combo.set_sensitive (false); - } - } + if (track_button.get_active()) { + track_mode_combo.set_sensitive (true); + } else { + track_mode_combo.set_sensitive (false); + } } bool @@ -271,15 +203,12 @@ int AddRouteDialog::channels () { string str = channel_combo.get_active_text(); - int chns; - - if (str == _("Mono")) { - return 1; - } else if (str == _("Stereo")) { - return 2; - } else if ((chns = PBD::atoi (str)) != 0) { - return chns; - } + + for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) { + if (str == (*i).name) { + return (*i).channels; + } + } return 0; } @@ -287,56 +216,90 @@ AddRouteDialog::channels () string AddRouteDialog::track_template () { - if (!template_button.get_active()) { - return string (); - } - - string str = track_template_combo.get_active_text(); - - for (vector::iterator x = route_templates.begin(); x != route_templates.end(); ++x) { - if ((*x).name == str) { - return (*x).path; - } - } - - return string(); + 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).template_path; + } + } + + return string(); } void AddRouteDialog::on_show () { - refill_track_templates (); - Dialog::on_show (); + refill_channel_setups (); + Dialog::on_show (); } - void -AddRouteDialog::refill_track_templates () +AddRouteDialog::refill_channel_setups () { - route_templates.clear (); - Session::get_route_templates (route_templates); - - if (!route_templates.empty()) { - vector v; - for (vector::iterator x = route_templates.begin(); x != route_templates.end(); ++x) { - v.push_back ((*x).name); - } - set_popdown_strings (track_template_combo, v); - track_template_combo.set_active_text (v.front()); - } - - reset_template_option_visibility (); -} + ChannelSetup chn; + + route_templates.clear (); + channel_combo_strings.clear (); + channel_setups.clear (); -void -AddRouteDialog::reset_template_option_visibility () -{ - if (route_templates.empty()) { - hbox3->hide (); - hbox9->hide (); - hbox4->hide (); - } else { - hbox3->show_all (); - hbox9->show_all (); - hbox4->show_all (); - } + chn.name = _("Mono"); + chn.channels = 1; + channel_setups.push_back (chn); + + chn.name = _("Stereo"); + chn.channels = 2; + channel_setups.push_back (chn); + + Session::get_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); + } + } + + /* no more templates for the rest */ + chn.template_path = ""; + + 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 = _("5 Channel"); + chn.channels = 5; + 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 = _("12 Channel"); + chn.channels = 12; + channel_setups.push_back (chn); + + chn.name = X_("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()); } +