diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 14 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 6500871412..a7695b5ebf 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -110,10 +110,12 @@ class MidiDiskstream : public Diskstream } /** Emitted when some MIDI data has been received for recording. - * First parameter is the data. - * Second parameter is the source that it is destined for. + * Parameter is the source that it is destined for. + * A caller can get a copy of the data with get_gui_feed_buffer () */ - 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; protected: friend class Session; @@ -189,6 +191,12 @@ class MidiDiskstream : public Diskstream NoteMode _note_mode; volatile gint _frames_written_to_ringbuffer; volatile gint _frames_read_from_ringbuffer; + + /** A buffer that we use to put newly-arrived MIDI data in for + the GUI to read (so that it can update itself). + */ + MidiBuffer _gui_feed_buffer; + mutable Glib::Mutex _gui_feed_buffer_mutex; }; }; /* namespace ARDOUR */ 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*); |