summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_streamview.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2012-06-15 15:01:35 +0000
committerCarl Hetherington <carl@carlh.net>2012-06-15 15:01:35 +0000
commita8dd4ec8053d77a5501f16c2cc1bba24f82f1b95 (patch)
tree7d25cad8bb22543b323d4ea25a84ccb95d74937f /gtk2_ardour/audio_streamview.cc
parente258a15330a7cf1dfb7f54870fc6945cdbd07922 (diff)
Re-show all xfades that we hide during drags (#4933).
git-svn-id: svn://localhost/ardour2/branches/3.0@12729 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
-rw-r--r--gtk2_ardour/audio_streamview.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 22e07c0ec9..123cb5eb64 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -530,9 +530,14 @@ AudioStreamView::hide_all_fades ()
}
}
-void
+/** Hide xfades for regions that overlap ar.
+ * @return AudioRegionViews that xfades were hidden for.
+ */
+list<AudioRegionView*>
AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
{
+ list<AudioRegionView*> hidden;
+
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
if (arv) {
@@ -541,10 +546,13 @@ AudioStreamView::hide_xfades_with (boost::shared_ptr<AudioRegion> ar)
break;
default:
arv->hide_xfades ();
+ hidden.push_back (arv);
break;
}
}
}
+
+ return hidden;
}
void