diff options
| author | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
| commit | 868f557f2612903f72614a2b3a317c7a528188d1 (patch) | |
| tree | 979151d7bbb25fb633adb662d386ef4df0d46158 /libs/ardour/playlist.cc | |
| parent | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (diff) | |
Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/playlist.cc')
| -rw-r--r-- | libs/ardour/playlist.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 73be1da86d..1bc6ccac6d 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -225,8 +225,8 @@ Playlist::copy_regions (RegionList& newlist) const void Playlist::init (bool hide) { - atomic_set (&block_notifications, 0); - atomic_set (&ignore_state_changes, 0); + g_atomic_int_set (&block_notifications, 0); + g_atomic_int_set (&ignore_state_changes, 0); pending_modified = false; pending_length = false; _refcnt = 0; @@ -292,13 +292,13 @@ void Playlist::freeze () { delay_notifications (); - atomic_inc (&ignore_state_changes); + g_atomic_int_inc (&ignore_state_changes); } void Playlist::thaw () { - atomic_dec (&ignore_state_changes); + g_atomic_int_dec_and_test (&ignore_state_changes); release_notifications (); } @@ -306,14 +306,14 @@ Playlist::thaw () void Playlist::delay_notifications () { - atomic_inc (&block_notifications); + g_atomic_int_inc (&block_notifications); freeze_length = _get_maximum_extent(); } void Playlist::release_notifications () { - if (atomic_dec_and_test(&block_notifications)) { + if (g_atomic_int_dec_and_test (&block_notifications)) { flush_notifications (); } } |