change MidiPlaylist::dump() into ::render(); change type of initial argument

3 files changed, 10 insertions, 5 deletions

diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index cd2ccddef7..1b01bbdc2d 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -48,6 +48,7 @@ namespace ARDOUR
 class BeatsSamplesConverter;
 class MidiChannelFilter;
 class MidiRegion;
+class RTMidiBuffer;
 class Session;
 class Source;
 
@@ -88,7 +89,7 @@ public:
 	                 uint32_t                         chan_n = 0,
 	                 MidiChannelFilter*               filter = NULL);
 
-	void dump (Evoral::EventSink<samplepos_t>&, MidiChannelFilter*);
+	void render (RTMidiBuffer&, MidiChannelFilter*);
 
 	int set_state (const XMLNode&, int version);
 
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 2b99ede256..500c483827 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -118,10 +118,10 @@ class LIBARDOUR_API MidiRegion : public Region
 
 	void clobber_sources (boost::shared_ptr<MidiSource> source);
 
-	int dump_to (Evoral::EventSink<samplepos_t>& dst,
-	              uint32_t                        chan_n,
-	              NoteMode                        mode,
-	              MidiChannelFilter*              filter) const;
+	int render (Evoral::EventSink<samplepos_t>& dst,
+	            uint32_t                        chan_n,
+	            NoteMode                        mode,
+	            MidiChannelFilter*              filter) const;
 
   protected:
 
diff --git a/libs/ardour/ardour/rt_midibuffer.h b/libs/ardour/ardour/rt_midibuffer.h
index da2c5c0e05..5bb12afef9 100644
--- a/libs/ardour/ardour/rt_midibuffer.h
+++ b/libs/ardour/ardour/rt_midibuffer.h
@@ -25,6 +25,8 @@
 
 #include <map>
 
+#include <glibmm/threads.h>
+
 #include "evoral/Event.hpp"
 #include "evoral/EventSink.hpp"
 #include "ardour/types.h"
@@ -82,6 +84,8 @@ class LIBARDOUR_API RTMidiBuffer : public Evoral::EventSink<samplepos_t>
 	uint32_t _pool_size;
 	uint32_t _pool_capacity;
 	uint8_t* _pool;
+
+	mutable Glib::Threads::RWLock _lock;
 };
 
 } // namespace ARDOUR