Merge https://github.com/LMMS/lmms into stable-0.4

include/AutomationEditor.h

@@ -153,7 +153,7 @@ private:
 	} ;
 
 	// some constants...
-	static const int INITIAL_WIDTH = 740;
+	static const int INITIAL_WIDTH = 860;
 	static const int INITIAL_HEIGHT = 480;
 
 	static const int SCROLLBAR_SIZE = 16;
@@ -249,6 +249,7 @@ private:
 	bool m_scrollBack;
 
 	void drawCross( QPainter & _p );
+	void drawAutomationPoint( QPainter & p, timeMap::iterator it );
 	bool inBBEditor();
 
 

include/AutomationPattern.h

@@ -111,6 +111,16 @@ public:
 		return m_tangents;
 	}
 
+	inline float getMin() const
+	{
+		return firstObject()->minValue<float>();
+	}
+
+	inline float getMax() const
+	{
+		return firstObject()->maxValue<float>();
+	}
+
 	inline bool hasAutomation() const
 	{
 		return m_timeMap.isEmpty() == false;
@@ -169,6 +179,8 @@ private:
 
 	bool m_dragging;
 
+	static const float DEFAULT_MIN_VALUE = 0;
+	static const float DEFAULT_MAX_VALUE = 1;
 
 	friend class AutomationPatternView;
 

include/AutomationPatternView.h

@@ -66,6 +66,8 @@ private:
 	QPixmap m_paintPixmap;
 	bool m_needsUpdate;
 
+	void scaleTimemapToFit( float oldMin, float oldMax );
+
 } ;
 
 

include/PeakController.h

@@ -53,6 +53,9 @@ public:
 	virtual void loadSettings( const QDomElement & _this );
 	virtual QString nodeName() const;
 
+	static void initGetControllerBySetting();
+	static PeakController * getControllerBySetting( const QDomElement & _this );
+
 	static PeakControllerEffectVector s_effects;
 
 
@@ -67,6 +70,12 @@ protected:
 	PeakControllerEffect * m_peakEffect;
 
 	friend class PeakControllerDialog;
+
+private:
+	//backward compatibility for <= 0.4.15
+	static int m_getCount;
+	static int m_loadCount;
+	static bool m_buggedFile;
 } ;
 
 

include/SampleBuffer.h

@@ -174,7 +174,8 @@ public:
 
     QString openAudioFile() const;
     QString openAndSetAudioFile();
-
+	QString openAndSetWaveformFile();
+	
 	QString & toBase64( QString & _dst ) const;