From fd2aea103790a1f49211f3bec7e9cdc246762e77 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Fri, 4 Nov 2011 17:52:12 +0000
Subject: Remove non-RT-safe alloc in the MIDI process() call.

git-svn-id: svn://localhost/ardour2/branches/3.0@10441 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/midi_track.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'libs/ardour/midi_track.cc')

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 9114311ac9..3253485412 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -122,7 +122,7 @@ MidiTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 	boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream> (ds);
 	mds->DataRecorded.connect_same_thread (
 		_diskstream_data_recorded_connection,
-		boost::bind (&MidiTrack::diskstream_data_recorded, this, _1, _2));
+		boost::bind (&MidiTrack::diskstream_data_recorded, this, _1));
 
 	DiskstreamChanged (); /* EMIT SIGNAL */
 }
@@ -654,9 +654,9 @@ MidiTrack::midi_playlist ()
 }
 
 void
-MidiTrack::diskstream_data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> src)
+MidiTrack::diskstream_data_recorded (boost::weak_ptr<MidiSource> src)
 {
-	DataRecorded (buf, src); /* EMIT SIGNAL */
+	DataRecorded (src); /* EMIT SIGNAL */
 }
 
 bool
@@ -717,3 +717,9 @@ MidiTrack::diskstream_factory (XMLNode const & node)
 {
 	return boost::shared_ptr<Diskstream> (new MidiDiskstream (_session, node));
 }
+
+boost::shared_ptr<MidiBuffer>
+MidiTrack::get_gui_feed_buffer () const
+{
+	return midi_diskstream()->get_gui_feed_buffer ();
+}
-- 
cgit v1.2.3