Changes AutomationPattern to use nodes instead of raw float values

include/AutomationEditor.h

@@ -131,6 +131,10 @@ public slots:
 	void selectAll();
 	void getSelectedValues(timeMap & selected_values );
 
+	// Returns the an iterator pointing to the AutomationNode on a radius of
+	// r pixels of the x,y mouse coordinates, or timeMap.end() if there are none.
+	timeMap::iterator getNodeAt( int x, int y, int r = 5 );
+
 	void drawLine( int x0, float y0, int x1, float y1 );
 	void removePoints( int x0, int x1 );
 
@@ -167,6 +171,7 @@ protected slots:
 	{
 		NONE,
 		MOVE_VALUE,
+		DRAW_LINE,
 		SELECT_VALUES,
 		MOVE_SELECTION
 	} ;

include/AutomationPattern.h

@@ -38,6 +38,77 @@ class MidiTime;
 
 
 
+class AutomationNode
+{
+public:
+	AutomationNode();
+	AutomationNode( float value );
+	AutomationNode( float inValue, float outValue );
+
+	inline float getInValue()
+	{
+		return m_inValue;
+	}
+	inline const float getInValue() const
+	{
+		return m_inValue;
+	}
+	inline void setInValue( float value )
+	{
+		m_inValue = value;
+	}
+
+	inline float getOutValue()
+	{
+		return m_outValue;
+	}
+	inline const float getOutValue() const
+	{
+		return m_outValue;
+	}
+	inline void setOutValue( float value )
+	{
+		m_outValue = value;
+	}
+
+	inline float getInTangent()
+	{
+		return m_inTangent;
+	}
+	inline const float getInTangent() const
+	{
+		return m_inTangent;
+	}
+	inline void setInTangent( float tangent )
+	{
+		m_inTangent = tangent;
+	}
+
+	inline float getOutTangent()
+	{
+		return m_outTangent;
+	}
+	inline const float getOutTangent() const
+	{
+		return m_outTangent;
+	}
+	inline void setOutTangent( float tangent )
+	{
+		m_outTangent = tangent;
+	}
+
+private:
+	float m_inValue;
+	float m_outValue;
+
+	// Slope at each point for calculating spline
+	// We might have discrete jumps between curves, so we possibly have
+	// two different tangents for each side of the curve. If inValue and
+	// outValue are equal, inTangent and outTangent are equal too.
+	float m_inTangent;
+	float m_outTangent;
+} ;
+
 class LMMS_EXPORT AutomationPattern : public TrackContentObject
 {
 	Q_OBJECT
@@ -49,7 +120,7 @@ class LMMS_EXPORT AutomationPattern : public TrackContentObject
 		CubicHermiteProgression
 	} ;
 
-	typedef QMap<int, float> timeMap;
+	typedef QMap<int, AutomationNode> timeMap;
 	typedef QVector<QPointer<AutomatableModel> > objectVector;
 
 	AutomationPattern( AutomationTrack * _auto_track );
@@ -109,16 +180,6 @@ class LMMS_EXPORT AutomationPattern : public TrackContentObject
 		return m_timeMap;
 	}
 
-	inline const timeMap & getTangents() const
-	{
-		return m_tangents;
-	}
-
-	inline timeMap & getTangents()
-	{
-		return m_tangents;
-	}
-
 	inline float getMin() const
 	{
 		return firstObject()->minValue<float>();
@@ -170,15 +231,14 @@ public slots:
 private:
 	void cleanObjects();
 	void generateTangents();
-	void generateTangents( timeMap::const_iterator it, int numToGenerate );
+	void generateTangents( timeMap::iterator it, int numToGenerate );
 	float valueAt( timeMap::const_iterator v, int offset ) const;
 
 	AutomationTrack * m_autoTrack;
 	QVector<jo_id_t> m_idsToResolve;
 	objectVector m_objects;
 	timeMap m_timeMap;	// actual values
 	timeMap m_oldTimeMap;	// old values for storing the values before setDragValue() is called.
-	timeMap m_tangents;	// slope at each point for calculating spline
 	float m_tension;
 	bool m_hasAutomation;
 	ProgressionTypes m_progressionType;

include/DataFile.h

@@ -115,6 +115,7 @@ class LMMS_EXPORT DataFile : public QDomDocument
 	void upgrade_1_2_0_rc3();
 	void upgrade_1_3_0();
 	void upgrade_noHiddenClipNames();
+	void upgrade_automationNodes();
 
 	// List of all upgrade methods
 	static const std::vector<UpgradeMethod> UPGRADE_METHODS;

include/InlineAutomation.h

@@ -57,8 +57,9 @@ class InlineAutomation : public FloatModel, public sharedObject
 			// of model which is going to be saved anyways
 			if( isAtInitValue() &&
 				m_autoPattern->getTimeMap().size() == 1 &&
-				m_autoPattern->getTimeMap().keys().first() == 0 &&
-				m_autoPattern->getTimeMap().values().first() == value() )
+				m_autoPattern->getTimeMap().begin().key() == 0 &&
+				// TODO: Do we really care about outValue if we only have one node? I'm assuming no.
+				m_autoPattern->getTimeMap().begin().value().getInValue() == value() )
 			{
 				return false;
 			}