Replace horribly error-prone Sequence/MidiModel/MidiSource locking API with scoped locks that automatically Do The Right Thing.

Make Sequence::read_lock const correct in the process (a read lock can be taken out on a const Sequence, but not a write lock).


git-svn-id: svn://localhost/ardour2/branches/3.0@5857 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 0 deletions

diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h
index 6496fd169a..cebc435435 100644
--- a/libs/ardour/ardour/midi_model.h
+++ b/libs/ardour/ardour/midi_model.h
@@ -166,6 +166,21 @@ public:
 	boost::shared_ptr<Evoral::Note<TimeType> > find_note (boost::shared_ptr<Evoral::Note<TimeType> >);
 
 private:
+	struct WriteLockImpl : public AutomatableSequence<Evoral::MusicalTime>::WriteLockImpl {
+		WriteLockImpl(Glib::Mutex::Lock* source_lock, Glib::RWLock& s, Glib::Mutex& c)
+			: AutomatableSequence<Evoral::MusicalTime>::WriteLockImpl(s, c)
+			, source_lock(source_lock)
+		{}
+		~WriteLockImpl() {
+			delete source_lock;
+		}
+		Glib::Mutex::Lock* source_lock;
+	};
+
+public:
+	virtual WriteLock write_lock();
+
+private:
 	friend class DeltaCommand;
 
 	// We cannot use a boost::shared_ptr here to avoid a retain cycle