diff options
author | Carl Hetherington <carl@carlh.net> | 2010-07-14 00:58:15 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-07-14 00:58:15 +0000 |
commit | 593b421180290f46f39efcb21ed8192b624bbc73 (patch) | |
tree | f8a81aad5fae8683818103b192d3c53a26110728 /gtk2_ardour/automation_time_axis.h | |
parent | b75977920e7cb02ae31bca0379dd3aa4d82f9cbc (diff) |
A few fixes to interpolation of MIDI controller data. Don't interpolate
when writing these data back to a source, otherwise surprising new
interpolated points appear in MIDI automation. Similarly don't interpolate
when reading the model during MIDI stretch. Fix handling of interpolation state;
controllers that have been set by the user to use a different interpolation style
are noted in the <Source> tag of the session file and this state is sprayed around
to MidiModel and the GUI as necessary.
git-svn-id: svn://localhost/ardour2/branches/3.0@7409 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.h')
-rw-r--r-- | gtk2_ardour/automation_time_axis.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index 9d4802f6fc..4b21ec8533 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -116,7 +116,8 @@ class AutomationTimeAxisView : public TimeAxisView { ArdourCanvas::SimpleRect* _base_rect; boost::shared_ptr<AutomationLine> _line; - AutomationStreamView* _view; + /** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */ + AutomationStreamView* _view; std::string _name; bool ignore_toggle; @@ -156,9 +157,9 @@ class AutomationTimeAxisView : public TimeAxisView { void automation_state_changed (); void set_interpolation (ARDOUR::AutomationList::InterpolationStyle); - void interpolation_changed (); + void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle); - PBD::ScopedConnection automation_connection; + PBD::ScopedConnectionList _list_connections; void update_extra_xml_shown (bool editor_shown); |