Some improvements to LFO controller

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@906 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/controller.h

@@ -33,6 +33,7 @@
 #include "engine.h"
 #include "mixer.h"
 #include "mv_base.h"
+#include "templates.h"
 
 class controllerDialog;
 class controller; 
@@ -64,6 +65,11 @@ public:
 		return "Dummy Controller";
 	}
 
+	inline static float fittedValue( float _val )
+	{
+		return tLimit<float>( _val, 0.0f, 1.0f );
+	}
+
 	static int runningFrames();
 	static float runningTime();
 

include/lfo_controller.h

@@ -78,13 +78,15 @@ slots:
 
 	*/
 
-	floatModel m_lfoAttackModel;
+	floatModel m_lfoBaseModel;
 	tempoSyncKnobModel m_lfoSpeedModel;
 	floatModel m_lfoAmountModel;
+	floatModel m_lfoPhaseModel;
 	intModel m_lfoWaveModel;
 
 	int m_duration;
 	int m_phaseCorrection;
+	int m_phaseOffset;
 	
 
 	friend class lfoControllerDialog;
@@ -116,9 +118,11 @@ protected:
 
 	lfoController * m_lfo;
 
-	knob * m_lfoAttackKnob;
+	knob * m_lfoBaseKnob;
 	tempoSyncKnob * m_lfoSpeedKnob;
 	knob * m_lfoAmountKnob;
+	knob * m_lfoPhaseKnob;
+
 	pixmapButton * m_userLfoBtn;
 	automatableButtonGroup * m_lfoWaveBtnGrp;