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_butler.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_butler.cc')
-rw-r--r-- | libs/ardour/session_butler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index df867c8267..12a838b5dd 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -254,6 +254,8 @@ Session::butler_thread_work () gettimeofday (&begin, 0); + RWLockMonitor dsm (diskstream_lock, false, __LINE__, __FILE__); + for (i = diskstreams.begin(); !transport_work_requested() && butler_should_run && i != diskstreams.end(); ++i) { // cerr << "rah fondr " << (*i)->io()->name () << endl; @@ -394,7 +396,7 @@ Session::overwrite_some_buffers (DiskStream* ds) } else { - LockMonitor dm (diskstream_lock, __LINE__, __FILE__); + RWLockMonitor dm (diskstream_lock, false, __LINE__, __FILE__); for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) { (*i)->set_pending_overwrite (true); } |