X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fadd_route_dialog.cc;h=650a371bd6ddaaf3726e2a8bcf3fe527fef9105a;hb=39a4068e36f632f2ff8abf99881d40e26d7e5183;hp=d5e207ad7900254cc12fcd3555f6297249c26e53;hpb=8623302340b091fd65a5ad2ff5dc25915ea297ca;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index d5e207ad79..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. */ @@ -22,10 +22,12 @@ #include #include +#include #include #include #include #include +#include #include "utils.h" #include "add_route_dialog.h" @@ -36,17 +38,7 @@ using namespace Gtkmm2ext; using namespace sigc; using namespace std; using namespace PBD; - -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 -}; +using namespace ARDOUR; static const char* track_mode_names[] = { N_("Normal"), @@ -54,9 +46,6 @@ static const char* track_mode_names[] = { 0 }; -static vector channel_combo_strings; -static vector track_mode_strings; - AddRouteDialog::AddRouteDialog () : Dialog (_("ardour: add track/bus")), @@ -65,19 +54,6 @@ AddRouteDialog::AddRouteDialog () 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); @@ -89,7 +65,7 @@ AddRouteDialog::AddRouteDialog () } } } - + set_name ("AddRouteDialog"); set_wmclass (X_("ardour_add_track_bus"), "Ardour"); set_position (Gtk::WIN_POS_MOUSE); @@ -104,58 +80,70 @@ AddRouteDialog::AddRouteDialog () bus_button.set_group (g); track_button.set_active (true); - HBox *hbrb = manage (new HBox); + /* add */ - hbrb->set_spacing (6); - hbrb->pack_start (routes_spinner, true, false, 5); - hbrb->pack_start (track_button, true, false, 5); - hbrb->pack_start (bus_button, true, false, 5); + HBox* hbox1 = manage (new HBox); + hbox1->set_spacing (6); + Label* label1 = manage (new Label (_("Add this many:"))); + hbox1->pack_start (*label1, PACK_SHRINK); + hbox1->pack_start (routes_spinner, PACK_SHRINK); - aframe.set_label (_("Add")); - aframe.set_shadow_type (SHADOW_IN); - aframe.add (*hbrb); + HBox* hbox2 = manage (new HBox); + hbox2->set_spacing (6); + hbox2->set_border_width (6); + hbox2->pack_start (*hbox1, PACK_EXPAND_WIDGET); + + /* track/bus choice & modes */ + + HBox* hbox5 = manage (new HBox); + hbox5->set_spacing (6); + 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)); + 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)); -#if NOT_USEFUL_YET - HBox *hbnt = manage (new HBox); + VBox* vbox1 = manage (new VBox); + vbox1->set_spacing (6); + vbox1->set_border_width (6); - hbnt->pack_start (*(manage (new Label (_("Name (template)")))), false, false); - hbnt->pack_start (name_template_entry, true, true); -#endif - VBox *dvbox = manage (new VBox); - HBox *dhbox = manage (new HBox); + Frame* frame1 = manage (new Frame (_("Channel Configuration"))); + frame1->add (channel_combo); + Frame* frame2 = manage (new Frame (_("Track Mode"))); + frame2->add (track_mode_combo); - ccframe.set_label (_("Channel Configuration")); - ccframe.set_shadow_type (SHADOW_IN); + vbox1->pack_start (*hbox5, PACK_SHRINK); + vbox1->pack_start (*frame1, PACK_SHRINK); - dvbox->pack_start (channel_combo, true, false, 5); if (!ARDOUR::Profile->get_sae()) { - dvbox->pack_start (track_mode_combo, true, false, 5); + vbox1->pack_start (*frame2, PACK_SHRINK); } - dhbox->pack_start (*dvbox, true, false, 5); - ccframe.add (*dhbox); + get_vbox()->set_spacing (6); + get_vbox()->set_border_width (6); - get_vbox()->pack_start (aframe, true, false, 10); - get_vbox()->pack_start (ccframe, true, false); -#if NOT_USEFUL_YET - get_vbox()->pack_start (*hbnt, false, false); -#endif + get_vbox()->pack_start (*hbox2, PACK_SHRINK); + get_vbox()->pack_start (*vbox1, PACK_SHRINK); get_vbox()->show_all (); + /* track template info will be managed whenever + this dialog is shown, via ::on_show() + */ + add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (Stock::ADD, RESPONSE_ACCEPT); + + track_type_chosen (); } AddRouteDialog::~AddRouteDialog () @@ -215,16 +203,103 @@ 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; } +string +AddRouteDialog::track_template () +{ + 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_channel_setups (); + Dialog::on_show (); +} +void +AddRouteDialog::refill_channel_setups () +{ + ChannelSetup chn; + + route_templates.clear (); + channel_combo_strings.clear (); + channel_setups.clear (); + + 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()); +} +