diff options
| author | David Robillard <d@drobilla.net> | 2006-06-21 18:14:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-21 18:14:45 +0000 |
| commit | 13532c8500dce5f7a4525bcdfc3b44936fbaa5e6 (patch) | |
| tree | 6877b3c3122968665454cd1a1cbb104151c5b788 /libs/ardour/audiosource.cc | |
| parent | 6a1f2919f20286b7d51de8e9c02107ab42f8e763 (diff) | |
Merged with trunk
git-svn-id: svn://localhost/ardour2/branches/midi@628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audiosource.cc')
| -rw-r--r-- | libs/ardour/audiosource.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 46596ad64f..add9364cad 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -792,7 +792,9 @@ AudioSource::do_build_peak (jack_nframes_t first_frame, jack_nframes_t cnt) frames_to_read = min (frames_per_peak, cnt); - if ((frames_read = read_unlocked (buf, current_frame, frames_to_read, workbuf)) != frames_to_read) { + /* lock for every read */ + + if ((frames_read = read (buf, current_frame, frames_to_read, workbuf)) != frames_to_read) { error << string_compose(_("%1: could not write read raw data for peak computation (%2)"), _name, strerror (errno)) << endmsg; goto out; } |