From 42dccb2a65089e006b268f797854f7662ac9746c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Aug 2009 22:01:26 +0000 Subject: Freeze the audio playlist after completing the set_state on the parent playlist (rather than before) so that the playlist state gets flushed before we start creating crossfades. Otherwise in some cases expected RegionViews won't exist for crossfades when they are created. git-svn-id: svn://localhost/ardour2/branches/3.0@5586 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_playlist.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 93bdc333f1..d6bd83a478 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -539,7 +539,6 @@ void AudioPlaylist::notify_crossfade_added (boost::shared_ptr x) if (g_atomic_int_get(&block_notifications)) { _pending_xfade_adds.insert (_pending_xfade_adds.end(), x); } else { - NewCrossfade (x); /* EMIT SIGNAL */ } } @@ -566,10 +565,11 @@ AudioPlaylist::set_state (const XMLNode& node) XMLNodeConstIterator niter; in_set_state++; - freeze (); Playlist::set_state (node); + freeze (); + nlist = node.children(); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { -- cgit v1.2.3