Merge branch 'stable-1.2'

include/AutomatableModel.h

@@ -444,6 +444,7 @@ public:
 
 } ;
 
+typedef QMap<AutomatableModel*, float> AutomatedValueMap;
 
 #endif
 

include/AutomationPattern.h

@@ -59,6 +59,7 @@ public:
 	bool addObject( AutomatableModel * _obj, bool _search_dup = true );
 
 	const AutomatableModel * firstObject() const;
+	const objectVector& objects() const;
 
 	// progression-type stuff
 	inline ProgressionTypes progressionType() const
@@ -83,6 +84,8 @@ public:
 
 	void removeValue( const MidiTime & time );
 
+	void recordValue(MidiTime time, float value);
+
 	MidiTime setDragValue( const MidiTime & time,
 				const float value,
 				const bool quantPos = true,
@@ -143,8 +146,6 @@ public:
 	static const QString classNodeName() { return "automationpattern"; }
 	QString nodeName() const { return classNodeName(); }
 
-	void processMidiTime( const MidiTime & _time );
-
 	virtual TrackContentObjectView * createView( TrackView * _tv );
 
 

include/Song.h

@@ -31,7 +31,6 @@
 #include <QtCore/QVector>
 
 #include "TrackContainer.h"
-#include "AutomatableModel.h"
 #include "Controller.h"
 #include "MeterModel.h"
 #include "VstSyncController.h"
@@ -205,6 +204,8 @@ public:
 		return m_globalAutomationTrack;
 	}
 
+	static AutomatedValueMap automatedValuesAt(const Track::tcoVector& tcos, MidiTime time);
+
 	// file management
 	void createNewProject();
 	void createNewProjectFromTemplate( const QString & templ );
@@ -325,6 +326,7 @@ private:
 
 	void removeAllControllers();
 
+	void processAutomations(const TrackList& tracks, MidiTime timeStart, fpp_t frames, int tcoNum);
 
 	AutomationTrack * m_globalAutomationTrack;
 

include/Track.h

@@ -146,6 +146,8 @@ public:
 		return m_selectViewOnCreate;
 	}
 
+	/// Returns true if and only if a->startPosition() < b->startPosition()
+	static bool comparePosition(const TrackContentObject* a, const TrackContentObject* b);
 
 public slots:
 	void copy();