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/session_click.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/session_click.cc')
| -rw-r--r-- | libs/ardour/session_click.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index c9777500a2..4503287da1 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -47,7 +47,7 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off return; } - TentativeRWLockMonitor clickm (click_lock, true, __LINE__, __FILE__); + Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK); if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) { _click_io->silence (nframes, offset); @@ -209,7 +209,7 @@ Session::setup_click_sounds (int which) void Session::clear_clicks () { - RWLockMonitor lm (click_lock, true, __LINE__, __FILE__); + Glib::RWLock::WriterLock lm (click_lock); for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) { delete *i; |