diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-04 17:52:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-04 17:52:12 +0000 |
| commit | fd2aea103790a1f49211f3bec7e9cdc246762e77 (patch) | |
| tree | a30f2386ffecfa5ce4529fa25c24a8357098c359 /libs/ardour/midi_track.cc | |
| parent | 07eadf68f342e289ca33a564a50f8f3af09996e3 (diff) | |
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
Diffstat (limited to 'libs/ardour/midi_track.cc')
| -rw-r--r-- | libs/ardour/midi_track.cc | 12 |
1 files changed, 9 insertions, 3 deletions
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 (); +} |