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_line.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_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 3e0f0f4bb3..161d33a80b 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -52,6 +52,7 @@ namespace Gnome { } } +/** A GUI representation of an ARDOUR::AutomationList */ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible { public: @@ -91,8 +92,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void set_line_color (uint32_t); uint32_t get_line_color() const { return _line_color; } - void set_interpolation(ARDOUR::AutomationList::InterpolationStyle style); - void show (); void hide (); void set_height (guint32); @@ -174,7 +173,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void reset_callback (const Evoral::ControlList&); void list_changed (); - PBD::ScopedConnection _state_connection; virtual bool event_handler (GdkEvent*); virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract); @@ -189,12 +187,12 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::list<double> _always_in_view; const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter; - ARDOUR::AutomationList::InterpolationStyle _interpolation; void reset_line_coords (ControlPoint&); void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t); - double control_point_box_size (); + void connect_to_list (); + void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle); struct ModelRepresentation { ARDOUR::AutomationList::iterator start; @@ -211,6 +209,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void model_representation (ControlPoint&, ModelRepresentation&); + PBD::ScopedConnectionList _list_connections; + friend class AudioRegionGainLine; }; |