smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

fix crash when trying to create a non-template track/bus with >2 channels; put MIDI after mono/stereo in the track config combo of AddRouteDialog

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5406 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-07-21 18:29:34 +00:00
parent b65f8073ba
commit 965ffc3950
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gtk2_ardour/add_route_dialog.cc
View file

@ -259,7 +259,7 @@ string
AddRouteDialog::track_template () AddRouteDialog::track_template ()
{ {
string str = channel_combo.get_active_text(); string str = channel_combo.get_active_text();
for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) { for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) {
if (str == (*i).name) { if (str == (*i).name) {
return (*i).template_path; return (*i).template_path;
@ -287,13 +287,6 @@ AddRouteDialog::refill_channel_setups ()
channel_combo_strings.clear (); channel_combo_strings.clear ();
channel_setups.clear (); channel_setups.clear ();
chn.name = X_("MIDI");
chn.channels = 0;
channel_setups.push_back (chn);
chn.name = "separator";
channel_setups.push_back (chn);
chn.name = _("Mono"); chn.name = _("Mono");
chn.channels = 1; chn.channels = 1;
channel_setups.push_back (chn); channel_setups.push_back (chn);
@ -302,6 +295,16 @@ AddRouteDialog::refill_channel_setups ()
chn.channels = 2; chn.channels = 2;
channel_setups.push_back (chn); channel_setups.push_back (chn);
chn.name = "separator";
channel_setups.push_back (chn);
chn.name = X_("MIDI");
chn.channels = 0;
channel_setups.push_back (chn);
chn.name = "separator";
channel_setups.push_back (chn);
ARDOUR::find_route_templates (route_templates); ARDOUR::find_route_templates (route_templates);
if (!ARDOUR::Profile->get_sae()) { if (!ARDOUR::Profile->get_sae()) {
@ -315,6 +318,10 @@ AddRouteDialog::refill_channel_setups ()
} }
} }
/* clear template path for the rest */
chn.template_path = "";
chn.name = _("3 Channel"); chn.name = _("3 Channel");
chn.channels = 3; chn.channels = 3;
channel_setups.push_back (chn); channel_setups.push_back (chn);