diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-14 22:56:58 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-14 22:56:58 +0000 |
| commit | 838a1965c9c31c5d60768a47ee0bea14aad2ca21 (patch) | |
| tree | 4b3238ac40af0359f23f434fa826e59426f28a99 | |
| parent | f1ed13ee4d74c616a57c04a6f6213c3ecabef510 (diff) | |
Fix and de-hackify removal of unnecessary separators in
input/output button popups.
git-svn-id: svn://localhost/ardour2/branches/3.0@10598 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index bf82130b95..3f20a479ad 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -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 (); } |