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

Fix deadlock issues.

Browse source 
Add IdentityConverter for when no conversion is actually needed.


git-svn-id: svn://localhost/ardour2/branches/3.0@4595 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-16 04:39:34 +00:00
parent 3963d2b0b2
commit 93d7040d04
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,12 +191,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
if (!_event || _event->size() == 0) {
DUMP(format("Starting at end @ %1%\n") % t);
_is_end = true;
_type = NIL;
if (_locked) {
_seq->read_unlock();
_locked = false;
}
_is_end = true;
_locked = false;
_seq->read_unlock();
} else {
DUMP(format("New iterator = %1% : %2% @ %3%\n")
% (int)_event->event_type()
@ -371,6 +369,8 @@ Sequence<Time>::const_iterator::operator=(const const_iterator& other)
if (other._locked) {
other._seq->read_lock();
}
} else if (!_locked && other._locked) {
_seq->read_lock();
}
_seq = other._seq;
@ -582,6 +582,7 @@ Sequence<Time>::append(const Event<Time>& event)
if (!midi_event_is_valid(ev.buffer(), ev.size())) {
cerr << "WARNING: Sequence ignoring illegal MIDI event" << endl;
write_unlock();
return;
}