diff options
author | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
commit | 9fdc36bac5fa1c004751c0dd42f9ff62b9d60814 (patch) | |
tree | 34a2d26c5cadcbe5c31b424e3e50a34a4360d87b /libs/ardour/audio_playlist.cc | |
parent | 55ba7c46c60d3cc9938abc34252fa930f1c883cb (diff) |
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
-rw-r--r-- | libs/ardour/audio_playlist.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index a0d43d5575..9f3c02ce43 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -203,7 +203,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, ch its OK to block (for short intervals). */ - LockMonitor rm (region_lock, __LINE__, __FILE__); + Glib::Mutex::Lock rm (region_lock); end = start + cnt - 1; @@ -504,7 +504,7 @@ AudioPlaylist::add_crossfade (Crossfade& xfade) void AudioPlaylist::notify_crossfade_added (Crossfade *x) { - if (atomic_read(&block_notifications)) { + if (g_atomic_int_get(&block_notifications)) { _pending_xfade_adds.insert (_pending_xfade_adds.end(), x); } else { NewCrossfade (x); /* EMIT SIGNAL */ |