diff options
author | Carl Hetherington <carl@carlh.net> | 2010-06-25 20:47:09 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-06-25 20:47:09 +0000 |
commit | ecb0cd5d119d28092a8f48e4521ac5eba197bb54 (patch) | |
tree | 57d7bcff09ab6d6382af929212ff4a4adeea2658 /libs/ardour/ardour/midi_source.h | |
parent | ad81fd40d22f63f0f9e7a247164b6b367fabb2fd (diff) |
Make MIDI region `automation' respect the automation mode so that it is
only played back if the automation mode is set to "Play". Munge AutoState
for AutomationRegionViews so that they reflect their AutomationTimeAxisView's
setting. Fixes #3135.
git-svn-id: svn://localhost/ardour2/branches/3.0@7304 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_source.h')
-rw-r--r-- | libs/ardour/ardour/midi_source.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 36c8548e20..0d0b744a95 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -63,7 +63,10 @@ class MidiSource : virtual public Source virtual nframes_t midi_read (Evoral::EventSink<nframes_t>& dst, sframes_t source_start, sframes_t start, nframes_t cnt, - sframes_t stamp_offset, sframes_t negative_stamp_offset, MidiStateTracker*) const; + sframes_t stamp_offset, + sframes_t negative_stamp_offset, + MidiStateTracker*, + std::set<Evoral::Parameter> const &) const; virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src, sframes_t source_start, @@ -111,9 +114,12 @@ class MidiSource : virtual public Source void set_note_mode(NoteMode mode); boost::shared_ptr<MidiModel> model() { return _model; } - void set_model(boost::shared_ptr<MidiModel> m) { _model = m; } + void set_model (boost::shared_ptr<MidiModel>); void drop_model(); + /** Emitted when a different MidiModel is set */ + PBD::Signal0<void> ModelChanged; + protected: virtual void flush_midi() = 0; |