diff options
author | David Robillard <d@drobilla.net> | 2008-09-21 16:17:02 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-09-21 16:17:02 +0000 |
commit | e14187aadd574d46c82d8eb0d151b526b84ddcc7 (patch) | |
tree | a80073703c5c3f4a68b4d50aee2c14be7cc1e204 /libs/ardour/ardour/midi_region.h | |
parent | eec19ca7afde0da57b2a4d9abc6ef847e6924975 (diff) |
Display recorded controller data (fix show all/existing automation).
git-svn-id: svn://localhost/ardour2/branches/3.0@3779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_region.h')
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index e0caddd954..2cbed8f99c 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -72,22 +72,28 @@ class MidiRegion : public Region int set_state (const XMLNode&); int separate_by_channel (ARDOUR::Session&, vector<MidiRegion*>&) const; - - UndoAction get_memento() const; - - // Act as a proxy for MidiModel automation stuff (for CC) - // Yep, this is pretty ugly... - Controls& controls() { return midi_source()->model()->controls(); } - const Controls& controls() const { return midi_source()->model()->controls(); } - boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false) - { return midi_source()->model()->control(id, create); } + /* automation */ + + boost::shared_ptr<Evoral::Control> + control(const Evoral::Parameter& id, bool create=false) { + return model()->data().control(id, create); + } - boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const - { return midi_source()->model()->control(id); } + virtual boost::shared_ptr<const Evoral::Control> + control(const Evoral::Parameter& id) const { + return model()->data().control(id); + } + + /* export */ int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); + UndoAction get_memento() const; + + boost::shared_ptr<MidiModel> model() { return midi_source()->model(); } + boost::shared_ptr<const MidiModel> model() const { return midi_source()->model(); } + private: friend class RegionFactory; |