diff options
| author | Robin Gareus <robin@gareus.org> | 2017-01-16 22:30:26 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-01-16 22:30:26 +0100 |
| commit | a9f0e218f5803bca6eb87e01ee47667e2ef02a5d (patch) | |
| tree | b60ba531e529cc4fc917c5be6b8698ca1c5e89e8 /gtk2_ardour/mixer_ui.cc | |
| parent | 17d54a0d1cac0ee698c85609030958ffaea0050a (diff) | |
Prepare generic spill ([mix]busses)
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 35986de0eb..4f87e04c7a 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1354,11 +1354,13 @@ Mixer_UI::redisplay_track_list () return; } - boost::shared_ptr<VCA> sv = spilled_vca.lock (); - - if (sv) { - spill_redisplay (sv); - return; + boost::shared_ptr<Stripable> ss = spilled_strip.lock (); + if (ss) { + boost::shared_ptr<VCA> sv = boost::dynamic_pointer_cast<VCA> (ss); + if (sv) { + spill_redisplay (sv); + return; + } } TreeModel::Children rows = track_model->children(); @@ -2830,13 +2832,13 @@ Mixer_UI::do_vca_unassign (boost::shared_ptr<VCA> vca) } void -Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca) +Mixer_UI::show_spill (boost::shared_ptr<Stripable> s) { - boost::shared_ptr<VCA> v = spilled_vca.lock(); - if (v != vca) { - spilled_vca = vca; - show_vca_change (vca); /* EMIT SIGNAL */ - if (vca) { + boost::shared_ptr<Stripable> ss = spilled_strip.lock(); + if (ss != s) { + spilled_strip = s; + show_spill_change (s); /* EMIT SIGNAL */ + if (s) { _group_tabs->hide (); } else { _group_tabs->show (); @@ -2846,9 +2848,9 @@ Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca) } bool -Mixer_UI::showing_vca_slaves_for (boost::shared_ptr<VCA> vca) const +Mixer_UI::showing_spill_for (boost::shared_ptr<Stripable> s) const { - return vca == spilled_vca.lock(); + return s == spilled_strip.lock(); } void |