ardour/livetrax
13
0
Fork 0
Code

possible fix for race between diskstream buffer overwrite and channel setup

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6843 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-02 20:14:28 +00:00
parent 7ed95f7c37
commit ad7025ae84
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/diskstream.cc
View File

@ -343,6 +343,12 @@ Diskstream::set_speed (double sp)
int int
Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist) Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
{ {
if (!playlist) {
return;
}
bool no_prior_playlist = true;
{ {
Glib::Mutex::Lock lm (state_lock); Glib::Mutex::Lock lm (state_lock);
@ -354,6 +360,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
if (_playlist) { if (_playlist) {
_playlist->release(); _playlist->release();
no_prior_playlist = false;
} }
_playlist = playlist; _playlist = playlist;
@ -373,7 +380,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
take care of the buffer refill. take care of the buffer refill.
*/ */
if (!overwrite_queued && !(_session.state_of_the_state() & Session::CannotSave)) { if (!overwrite_queued && no_prior_playlist) {
_session.request_overwrite_buffer (this); _session.request_overwrite_buffer (this);
overwrite_queued = true; overwrite_queued = true;
} }