diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-20 22:38:12 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-20 22:38:12 +0000 |
commit | a196405da9fab534b5ece4d165e871d02d671b36 (patch) | |
tree | 17cf937e579046c2fb84c30db5c09bb87def6451 /libs/ardour/ardour | |
parent | e58f6752af39d5aa032b45eca1c8f392fd874b16 (diff) |
various minor MIDI fixes: prevent duplicate note entry with mouse, show note info more often with verbose cursor, fix some crashes from click+move on notes ... lots more where this comes from
git-svn-id: svn://localhost/ardour2/branches/3.0@7128 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_model.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_source.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 8d949cadbb..b3a4d746a1 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -151,8 +151,9 @@ public: void apply_command(Session& session, Command* cmd); void apply_command_as_subcommand(Session& session, Command* cmd); - bool write_to(boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin = Evoral::MinMusicalTime, - Evoral::MusicalTime end = Evoral::MaxMusicalTime); + bool write_to(boost::shared_ptr<MidiSource> source); + bool write_section_to(boost::shared_ptr<MidiSource> source, Evoral::MusicalTime begin = Evoral::MinMusicalTime, + Evoral::MusicalTime end = Evoral::MaxMusicalTime); // MidiModel doesn't use the normal AutomationList serialisation code // since controller data is stored in the .mid diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 2484d3575a..c418559d6e 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -111,7 +111,7 @@ class MidiSource : virtual public Source boost::shared_ptr<MidiModel> model() { return _model; } void set_model(boost::shared_ptr<MidiModel> m) { _model = m; } - void drop_model() { _model.reset(); } + void drop_model(); protected: virtual void flush_midi() = 0; |