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

1 files changed, 4 insertions, 1 deletions

diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp
index b775bb3b4b..95de58dead 100644
--- a/libs/evoral/evoral/ControlSet.hpp
+++ b/libs/evoral/evoral/ControlSet.hpp
@@ -27,11 +27,11 @@
 #include "pbd/signals.h"
 #include "evoral/types.hpp"
 #include "evoral/Parameter.hpp"
+#include "evoral/ControlList.hpp"
 
 namespace Evoral {
 
 class Control;
-class ControlList;
 class ControlEvent;
 
 class ControlSet : public boost::noncopyable {
@@ -69,12 +69,15 @@ public:
 
 protected:
 	virtual void control_list_marked_dirty () {}
+	virtual void control_list_interpolation_changed (Parameter, ControlList::InterpolationStyle) {}
 
 	mutable Glib::Mutex _control_lock;
 	Controls            _controls;
 
 private:
+
 	PBD::ScopedConnectionList _control_connections;
+	PBD::ScopedConnectionList _list_connections;
 };