X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=29ae5cb3f399d85c60d8080117428f7776a2ea18;hb=6ab6ad5bb732512d04593b1a5d566d5e787d45ed;hp=07c1c320d791739fc8f2b882714f97e6929ec679;hpb=ca2d58c266f13b40c97624a050f26e917b4905cb;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 07c1c320d7..29ae5cb3f3 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -1,5 +1,5 @@ /* - 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 @@ -24,7 +24,6 @@ #include #include #include -#include #include "pbd/error.h" #include "pbd/convert.h" @@ -41,7 +40,6 @@ using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; using namespace std; using namespace PBD; using namespace ARDOUR; @@ -53,13 +51,17 @@ static const char* track_mode_names[] = { 0 }; -AddRouteDialog::AddRouteDialog (Session & s) - : ArdourDialog (X_("add route dialog")) - , _session (s) +std::vector AddRouteDialog::channel_combo_strings; +std::vector AddRouteDialog::track_mode_strings; + +AddRouteDialog::AddRouteDialog (Session* s) + : ArdourDialog (_("Add Track or Bus")) , routes_adjustment (1, 1, 128, 1, 4) , routes_spinner (routes_adjustment) - , track_mode_label (_("Track mode:")) + , mode_label (_("Track mode:")) { + set_session (s); + if (track_mode_strings.empty()) { track_mode_strings = I18N (track_mode_names); @@ -71,28 +73,24 @@ AddRouteDialog::AddRouteDialog (Session & s) } } } - + set_name ("AddRouteDialog"); set_position (Gtk::WIN_POS_MOUSE); set_modal (true); set_skip_taskbar_hint (true); set_resizable (false); - WindowTitle title(Glib::get_application_name()); - title += _("Add Route"); - set_title(title.get_string()); - name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry")); routes_spinner.set_name (X_("AddRouteDialogSpinner")); channel_combo.set_name (X_("ChannelCountSelector")); - track_mode_combo.set_name (X_("ChannelCountSelector")); + mode_combo.set_name (X_("ChannelCountSelector")); refill_channel_setups (); refill_route_groups (); - set_popdown_strings (track_mode_combo, track_mode_strings, true); + set_popdown_strings (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()); + mode_combo.set_active_text (track_mode_strings.front()); track_bus_combo.append_text (_("tracks")); track_bus_combo.append_text (_("busses")); @@ -108,13 +106,13 @@ AddRouteDialog::AddRouteDialog (Session & s) HBox *type_hbox = manage (new HBox); type_hbox->set_spacing (6); - + /* track/bus choice */ type_hbox->pack_start (*manage (new Label (_("Add:")))); type_hbox->pack_start (routes_spinner); type_hbox->pack_start (track_bus_combo); - + vbox->pack_start (*type_hbox, false, true); VBox* options_box = manage (new VBox); @@ -132,37 +130,48 @@ AddRouteDialog::AddRouteDialog (Session & s) l->set_padding (8, 0); table2->attach (*l, 0, 1, 0, 3, Gtk::FILL, Gtk::FILL, 0, 0); + int n = 0; + + l = manage (new Label (_("Name:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0); + table2->attach (name_template_entry, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0); + ++n; + /* Route configuration */ l = manage (new Label (_("Configuration:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); - table2->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0); - table2->attach (channel_combo, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0); + table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0); + 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 */ - track_mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); - table2->attach (track_mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0); - table2->attach (track_mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0); + 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; } - /* Group choise */ + /* Group choice */ l = manage (new Label (_("Group:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); - table2->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0); - table2->attach (route_group_combo, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0); - + table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0); + table2->attach (route_group_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0); + ++n; + options_box->pack_start (*table2, false, true); vbox->pack_start (*options_box, false, true); get_vbox()->pack_start (*vbox, false, false); - track_bus_combo.signal_changed().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - channel_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::channel_separator)); - route_group_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::route_separator)); - route_group_combo.signal_changed ().connect (mem_fun (*this, &AddRouteDialog::group_changed)); + track_bus_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::track_type_chosen)); + channel_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::maybe_update_name_template_entry)); + channel_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::channel_separator)); + route_group_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::route_separator)); + route_group_combo.signal_changed ().connect (sigc::mem_fun (*this, &AddRouteDialog::group_changed)); show_all_children (); @@ -180,11 +189,33 @@ AddRouteDialog::~AddRouteDialog () { } +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() != _("Bus")) { + return; + } + + if (track ()) { + if (type () == DataType::MIDI) { + name_template_entry.set_text (_("MIDI")); + } else { + name_template_entry.set_text (_("Audio")); + } + } else { + name_template_entry.set_text (_("Bus")); + } +} + void AddRouteDialog::track_type_chosen () { - track_mode_label.set_sensitive (track ()); - track_mode_combo.set_sensitive (track ()); + mode_combo.set_sensitive (track ()); + maybe_update_name_template_entry (); } bool @@ -196,14 +227,9 @@ AddRouteDialog::track () ARDOUR::DataType AddRouteDialog::type () { - // FIXME: ew - - const string str = channel_combo.get_active_text(); - if (str == _("MIDI")) { - return ARDOUR::DataType::MIDI; - } else { - return ARDOUR::DataType::AUDIO; - } + return (channel_combo.get_active_text() == _("MIDI")) + ? ARDOUR::DataType::MIDI + : ARDOUR::DataType::AUDIO; } string @@ -225,7 +251,7 @@ AddRouteDialog::mode () return ARDOUR::Normal; } - Glib::ustring str = track_mode_combo.get_active_text(); + std::string str = mode_combo.get_active_text(); if (str == _("Normal")) { return ARDOUR::Normal; } else if (str == _("Non Layered")){ @@ -245,7 +271,7 @@ int AddRouteDialog::channels () { 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).channels; @@ -259,7 +285,7 @@ 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; @@ -274,7 +300,7 @@ AddRouteDialog::on_show () { refill_channel_setups (); refill_route_groups (); - + Dialog::on_show (); } @@ -282,24 +308,27 @@ void AddRouteDialog::refill_channel_setups () { ChannelSetup chn; - + route_templates.clear (); channel_combo_strings.clear (); channel_setups.clear (); - chn.name = X_("MIDI"); - chn.channels = 0; + chn.name = _("Mono"); + chn.channels = 1; + channel_setups.push_back (chn); + + chn.name = _("Stereo"); + chn.channels = 2; channel_setups.push_back (chn); chn.name = "separator"; channel_setups.push_back (chn); - chn.name = _("Mono"); - chn.channels = 1; + chn.name = _("MIDI"); + chn.channels = 0; channel_setups.push_back (chn); - chn.name = _("Stereo"); - chn.channels = 2; + chn.name = "separator"; channel_setups.push_back (chn); ARDOUR::find_route_templates (route_templates); @@ -313,7 +342,11 @@ AddRouteDialog::refill_channel_setups () chn.template_path = x->path; channel_setups.push_back (chn); } - } + } + + /* clear template path for the rest */ + + chn.template_path = ""; chn.name = _("3 Channel"); chn.channels = 3; @@ -339,7 +372,7 @@ AddRouteDialog::refill_channel_setups () chn.channels = 12; channel_setups.push_back (chn); - chn.name = X_("Custom"); + chn.name = _("Custom"); chn.channels = 0; channel_setups.push_back (chn); } @@ -365,47 +398,49 @@ AddRouteDialog::route_group () return 0; } - return _session.route_group_by_name (route_group_combo.get_active_text()); + return _session->route_group_by_name (route_group_combo.get_active_text()); } void AddRouteDialog::refill_route_groups () { route_group_combo.clear (); - route_group_combo.append_text (_("New group...")); + route_group_combo.append_text (_("New Group...")); route_group_combo.append_text ("separator"); - route_group_combo.append_text (_("No group")); + route_group_combo.append_text (_("No Group")); + + _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); - _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group)); - route_group_combo.set_active (2); } void AddRouteDialog::group_changed () { - if (route_group_combo.get_active_text () == _("New group...")) { - RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r == Gtk::RESPONSE_OK) { - _session.add_route_group (g); + if (_session && route_group_combo.get_active_text () == _("New Group...")) { + RouteGroup* g = new RouteGroup (*_session, ""); + + PropertyList plist; + plist.add (Properties::active, true); + g->apply_changes (plist); + + RouteGroupDialog d (g, true); + + if (d.do_run ()) { + delete g; + route_group_combo.set_active (2); + } else { + _session->add_route_group (g); add_route_group (g); route_group_combo.set_active (3); - } else { - delete g; - - route_group_combo.set_active (0); } } } bool -AddRouteDialog::channel_separator (const Glib::RefPtr &m, const Gtk::TreeModel::iterator &i) +AddRouteDialog::channel_separator (const Glib::RefPtr &, const Gtk::TreeModel::iterator &i) { channel_combo.set_active (i); @@ -413,7 +448,7 @@ AddRouteDialog::channel_separator (const Glib::RefPtr &m, const } bool -AddRouteDialog::route_separator (const Glib::RefPtr &m, const Gtk::TreeModel::iterator &i) +AddRouteDialog::route_separator (const Glib::RefPtr &, const Gtk::TreeModel::iterator &i) { route_group_combo.set_active (i);