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/vca_master_strip.cc | |
| parent | 17d54a0d1cac0ee698c85609030958ffaea0050a (diff) | |
Prepare generic spill ([mix]busses)
Diffstat (limited to 'gtk2_ardour/vca_master_strip.cc')
| -rw-r--r-- | gtk2_ardour/vca_master_strip.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 7dfc396381..b3dcc06b16 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -148,7 +148,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v) mute_changed (); spill_change (boost::shared_ptr<VCA>()); - Mixer_UI::instance()->show_vca_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); + Mixer_UI::instance()->show_spill_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change)); _vca->PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context()); _vca->presentation_info().PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context()); @@ -165,9 +165,9 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v) VCAMasterStrip::~VCAMasterStrip () { - if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { + if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr<VCA>()); + Mixer_UI::instance()->show_spill (boost::shared_ptr<Stripable>()); } delete delete_dialog; @@ -179,9 +179,9 @@ VCAMasterStrip::~VCAMasterStrip () void VCAMasterStrip::self_delete () { - if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { + if ((_session && !_session->deletion_in_progress()) && Mixer_UI::instance()->showing_spill_for (_vca)) { /* cancel spill for this VCA */ - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr<VCA>()); + Mixer_UI::instance()->show_spill (boost::shared_ptr<Stripable>()); } /* Drop reference immediately, delete self when idle */ _vca.reset (); @@ -457,15 +457,15 @@ VCAMasterStrip::build_context_menu () void VCAMasterStrip::spill () { - if (Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr<VCA>()); + if (Mixer_UI::instance()->showing_spill_for (_vca)) { + Mixer_UI::instance()->show_spill (boost::shared_ptr<Stripable>()); } else { - Mixer_UI::instance()->show_vca_slaves (_vca); + Mixer_UI::instance()->show_spill (_vca); } } void -VCAMasterStrip::spill_change (boost::shared_ptr<VCA> vca) +VCAMasterStrip::spill_change (boost::shared_ptr<Stripable> vca) { if (vca != _vca) { vertical_button.set_active_state (Gtkmm2ext::Off); @@ -491,8 +491,8 @@ VCAMasterStrip::drop_all_slaves () { _vca->Drop (); /* EMIT SIGNAL */ - if (Mixer_UI::instance()->showing_vca_slaves_for (_vca)) { - Mixer_UI::instance()->show_vca_slaves (boost::shared_ptr<VCA>()); + if (Mixer_UI::instance()->showing_spill_for (_vca)) { + Mixer_UI::instance()->show_spill (boost::shared_ptr<Stripable>()); } } |