smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Minor tidy-ups.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9536 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-05-17 12:00:10 +00:00
parent fb9b778fbc
commit c86ccc7db2
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/evoral/src/Sequence.cpp
View file

@ -75,12 +75,12 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
{
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Created Iterator @ %1 (is end: %2)\n)", t, _is_end));
if (!_is_end) {
_lock = seq.read_lock();
} else {
if (_is_end) {
return;
}
_lock = seq.read_lock();
typename Sequence<Time>::ReadLock lock(seq.read_lock());
// Find first note which begins at or after t
@ -434,10 +434,11 @@ Sequence<Time>::const_iterator::operator=(const const_iterator& other)
_force_discrete = other._force_discrete;
_active_patch_change_message = other._active_patch_change_message;
if (other._lock)
if (other._lock) {
_lock = _seq->read_lock();
else
} else {
_lock.reset();
}
if (other._control_iter == other._control_iters.end()) {
_control_iter = _control_iters.end();