summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_track.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-11-04 17:52:12 +0000
committerCarl Hetherington <carl@carlh.net>2011-11-04 17:52:12 +0000
commitfd2aea103790a1f49211f3bec7e9cdc246762e77 (patch)
treea30f2386ffecfa5ce4529fa25c24a8357098c359 /libs/ardour/ardour/midi_track.h
parent07eadf68f342e289ca33a564a50f8f3af09996e3 (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/ardour/midi_track.h')
-rw-r--r--libs/ardour/ardour/midi_track.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 3d1ef558dc..a70fc4604d 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -104,7 +104,8 @@ public:
return false;
}
- PBD::Signal2<void, boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource> > DataRecorded;
+ PBD::Signal1<void, boost::weak_ptr<MidiSource> > DataRecorded;
+ boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
void set_input_active (bool);
bool input_active () const;
@@ -138,7 +139,7 @@ protected:
int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing);
void push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes);
- void diskstream_data_recorded (boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource>);
+ void diskstream_data_recorded (boost::weak_ptr<MidiSource>);
PBD::ScopedConnection _diskstream_data_recorded_connection;
void track_input_active (IOChange, void*);