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

Fix and de-hackify removal of unnecessary separators in

Browse source 
input/output button popups.


git-svn-id: svn://localhost/ardour2/branches/3.0@10598 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-14 22:56:58 +00:00
parent f1ed13ee4d
commit 838a1965c9
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/mixer_strip.cc
View file

@ -717,6 +717,7 @@ MixerStrip::output_press (GdkEventButton *ev)
}
citems.push_back (SeparatorElem());
uint32_t const n_with_separator = citems.size ();
ARDOUR::BundleList current = _route->output()->bundles_connected ();
@ -743,7 +744,7 @@ MixerStrip::output_press (GdkEventButton *ev)
maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current);
}
if (citems.size() == 2) {
if (citems.size() == n_with_separator) {
/* no routes added; remove the separator */
citems.pop_back ();
}
@ -838,6 +839,8 @@ MixerStrip::input_press (GdkEventButton *ev)
}
citems.push_back (SeparatorElem());
uint32_t const n_with_separator = citems.size ();
input_menu_bundles.clear ();
ARDOUR::BundleList current = _route->input()->bundles_connected ();
@ -865,7 +868,7 @@ MixerStrip::input_press (GdkEventButton *ev)
maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current);
}
if (citems.size() == 2) {
if (citems.size() == n_with_separator) {
/* no routes added; remove the separator */
citems.pop_back ();
}