diff options
| author | Jesse Chappell <jesse@essej.net> | 2006-01-06 04:59:17 +0000 |
|---|---|---|
| committer | Jesse Chappell <jesse@essej.net> | 2006-01-06 04:59:17 +0000 |
| commit | bd21c474e547d49338ea0efd452895de1e147cd5 (patch) | |
| tree | 2993bc781777530afc180313c9f69cc898f851e0 /libs/ardour/session_click.cc | |
| parent | 18844bac7aa0747453ed4d04c4a462f2044a43bb (diff) | |
committed RWlock fixes to libardour. added hw monitoring fixes from nick_m. minor alsa midi fix and update rate settings.
git-svn-id: svn://localhost/trunk/ardour2@244 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_click.cc')
| -rw-r--r-- | libs/ardour/session_click.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index 250adfe4cc..c9777500a2 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -46,8 +46,10 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off if (_click_io == 0) { return; } + + TentativeRWLockMonitor clickm (click_lock, true, __LINE__, __FILE__); - if (_transport_speed != 1.0 || !_clicking || click_data == 0) { + if (!clickm.locked() || _transport_speed != 1.0 || !_clicking || click_data == 0) { _click_io->silence (nframes, offset); return; } @@ -207,7 +209,7 @@ Session::setup_click_sounds (int which) void Session::clear_clicks () { - LockMonitor lm (route_lock, __LINE__, __FILE__); + RWLockMonitor lm (click_lock, true, __LINE__, __FILE__); for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) { delete *i; |