diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2008-05-03 06:37:22 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2008-05-03 06:37:22 +0000 |
| commit | b0d49651a77e6355e180c0a1d85ac3cb1288bc97 (patch) | |
| tree | e3731789342c629376f6801e825f938e4c195706 /libs/ardour/ardour | |
| parent | fb1fbf71af452ecff0a257bda228d1b31912c8ee (diff) | |
* MidiModel::const_iterator::operator++: added AUTOMATION type
* automatable.cc/parameter.cc: Added friendly names for the new Midi parameter types
* fixed a failed assertion problem (note on channel != note off channel), but have no idea how :)
* changed lots of whitespace :|
git-svn-id: svn://localhost/ardour2/branches/3.0@3309 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/automation_event.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_model.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h index 4f8406bd9b..18190aa9b6 100644 --- a/libs/ardour/ardour/automation_event.h +++ b/libs/ardour/ardour/automation_event.h @@ -238,7 +238,7 @@ class AutomationList : public PBD::StatefulDestructible Glib::Mutex& lock() const { return _lock; } LookupCache& lookup_cache() const { return _lookup_cache; } SearchCache& search_cache() const { return _search_cache; } - + /** Called by locked entry point and various private * locations where we already hold the lock. * diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 5f58b29ad8..c4d319f6bc 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -226,6 +226,9 @@ private: WriteNotes _write_notes[16]; bool _writing; bool _edited; + + typedef std::vector< boost::shared_ptr<const ARDOUR::AutomationList> > AutomationLists; + AutomationLists _dirty_automations; const const_iterator _end_iter; |