diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-20 21:02:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-20 21:02:46 +0000 |
| commit | 0d36301907afd612f93a7bfa53724cc9a17724de (patch) | |
| tree | 620c096be24ebc38b5762493d6ad79e839420395 /libs/ardour/midi_playlist.cc | |
| parent | f19c01bbb42f4e80769adb8e3e1015724fe9d6c6 (diff) | |
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
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
| -rw-r--r-- | libs/ardour/midi_playlist.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<nframes_t>& 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<Evoral::Parameter> ret; |