From 0d36301907afd612f93a7bfa53724cc9a17724de Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 20 Apr 2009 21:02:46 +0000 Subject: 3 notable patches from lincoln (a) non-layered track mode (NOTE: this is broken for loop recording right now) (b) trim region to previous/next region (c) region push/pull trimming. work on these 3 features should be assumed to be still slightly ongoing (eg. default bindings and more). great stuff git-svn-id: svn://localhost/ardour2/branches/3.0@4994 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/midi_playlist.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/midi_playlist.cc') diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 0e4c65ce3f..bb3603b8a8 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -130,7 +130,7 @@ MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start, nframes_t d its OK to block (for short intervals). */ - Glib::Mutex::Lock rm (region_lock); + Glib::RecMutex::Lock rm (region_lock); nframes_t end = start + dur - 1; @@ -271,7 +271,7 @@ MidiPlaylist::contained_automation() its OK to block (for short intervals). */ - Glib::Mutex::Lock rm (region_lock); + Glib::RecMutex::Lock rm (region_lock); set ret; -- cgit v1.2.3