diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-01-06 03:18:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-01-06 03:18:09 +0000 |
| commit | f2058a3f8739c6a7e9f7408f31d3b94ddb50673f (patch) | |
| tree | 2050e2386dc670b16259805d1ecdbf8fb350fe5b /gtk2_ardour/audio_streamview.cc | |
| parent | 780b75363915bd328877cba33766b1ac177b45c1 (diff) | |
Comment and (hopefully) simplify Editor::region_drag_motion_callback, fixing problems with dragging regions
to and from tracks in "stacked" display mode. As a side-effect, enable dragging of regions between layers,
though I'm not entirely sure where this is useful or desirable just yet; dragging regions between layers
currently works in the GUI but has no effect on the model.
git-svn-id: svn://localhost/ardour2/branches/3.0@4389 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index f79955b100..85812b43d6 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -308,7 +308,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade) for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { if ((*i)->crossfade == crossfade) { - if (!crossfades_visible || layer_display == Stacked) { + if (!crossfades_visible || _layer_display == Stacked) { (*i)->hide(); } else { (*i)->show (); @@ -340,7 +340,7 @@ AudioStreamView::add_crossfade (boost::shared_ptr<Crossfade> crossfade) cv->set_valid (true); crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); crossfade_views.push_back (cv); - if (!Config->get_xfades_visible() || !crossfades_visible || layer_display == Stacked) { + if (!Config->get_xfades_visible() || !crossfades_visible || _layer_display == Stacked) { cv->hide (); } } @@ -373,7 +373,7 @@ AudioStreamView::redisplay_diskstream () for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) { (*xi)->set_valid (false); - if ((*xi)->visible() && layer_display != Stacked) { + if ((*xi)->visible() && _layer_display != Stacked) { (*xi)->show (); } } @@ -806,7 +806,7 @@ void AudioStreamView::reveal_xfades_involving (AudioRegionView& rv) { for (list<CrossfadeView *>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible() && layer_display != Stacked) { + if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible() && _layer_display != Stacked) { (*i)->show (); } } @@ -836,7 +836,7 @@ AudioStreamView::update_contents_height () StreamView::update_contents_height (); for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if (layer_display == Overlaid) { + if (_layer_display == Overlaid) { (*i)->show (); (*i)->set_height (height); } else { |