projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32dd2a4
)
Freeze the audio playlist after completing the set_state on the parent playlist ...
author
Carl Hetherington
<carl@carlh.net>
Mon, 24 Aug 2009 22:01:26 +0000
(22:01 +0000)
committer
Carl Hetherington
<carl@carlh.net>
Mon, 24 Aug 2009 22:01:26 +0000
(22:01 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@5586
d708f5d6
-7413-0410-9779-
e7cbd77b26cf
libs/ardour/audio_playlist.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/audio_playlist.cc
b/libs/ardour/audio_playlist.cc
index 93bdc333f134413a67faf1ab5e2b91ca3c4beb72..d6bd83a4783fd0e00527de87b209f0cbfa26238b 100644
(file)
--- a/
libs/ardour/audio_playlist.cc
+++ b/
libs/ardour/audio_playlist.cc
@@
-539,7
+539,6
@@
void AudioPlaylist::notify_crossfade_added (boost::shared_ptr<Crossfade> 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) {