From 62068684c28a2ec0da17138a6b9d6215e6bf9e43 Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Sun, 4 May 2014 22:54:06 +0300
Subject: [PATCH] Fix to previous - use value<float>() instead of making an
 unnecessary new function... also accidentally didn't upload the new image
 last time

---
 data/themes/default/pat_rec.png | Bin 0 -> 1000 bytes
 include/AutomatableModel.h      |  10 ----------
 src/core/AutomationPattern.cpp  |   2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)
 create mode 100644 data/themes/default/pat_rec.png

diff --git a/data/themes/default/pat_rec.png b/data/themes/default/pat_rec.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c0ed94555f7743ca756e10cc707b025c28a2a04
GIT binary patch
literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq001Ze000jN1^@s6mRF7A00006VoOIv00000
z008+zyMF)x010qNS#tmYE+YT{E+YYWr9XB6000McNliru-US2_HyA&wfTREb02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00U4-L_t(Y$L*D0Xj69-$3MTD
zUUM6DT3ahZZE+}@edv>=xM2tdO_vlYOglP-jczLyRAilEVb5a>-9LsDb#6Y?<Y5mY
zt~CSy;83hV)HkbB<FYoUN=vQnFE@$(?cv_U+cfFR_UIQ5mwSHS-#OpkxxaHRyvBcn
zD0HYmpabYa&}cb`0>{L_K&XJHauL+5dI=<eKW5VD-X#|<i~*>i%~8V2r0gvN0|MZ(
z&*$3g@$3;weS#3{QAz?)ZE(<^%TqQdX<OT2T&|u1%|5^v^={tTc;(O5ytlmEc}f>h
z19bi+<rZKgFoscHsxays(7Y8DA)#qI9DW1X3Pb?^9D%C6y#rnEDHU<!n!4cEZ$CYE
z=<Z!hq+wX%`uov^Ah2>JXSQx(eO1*O;3UxM<P@T3`}U87+r1-|PG|OAzpnq5NU%cJ
z`KrDiTO<IQqas}x2Bpo-d$qMepd&BP7LeGr%M)&H-i_NJnMwh83pw_6%9~ic_)`pn
zgEwyI$K&zm6WQ#?52UR8;O5PBz%TPZv0*eK#DW)gLro1p7Z5_%t;%<I1Iz$qOmn95
z+BFaG0HA=Q@=E*q1a5Z&nnq}J6yS5<l)XF-bj}x;O4%1#Sh0ltbo9||It|#(BU6qg
zg_+3`931pq9v`0o_T)Lm+fiYf8H6BfHO|>mMR_Gq$|#!VTd0C}5{XwYrj=X^huOb&
zE#EdZamMRay|-@d`|0uHt4@vxhvx^AGLELb8LY0Re{?ikDyQbya11F~$bP(kA0TS;
zK}r<x-J?gYJ0l}QOOz6y)z$r4Syr~e$tiXRk@753@_j=CN9*gqoM>rz!wdx8n%%ao
zzvLXe+SGLJo#o4e#ZGcK7URJ1Fu;dENcsH=Ktv({VzRk;#Y-5e&~@WTESC6Uc(_*i
z{h6Y}Hxdz3EiF~1X+Er6v}kFO_0z!4xfKN79U5xwy?5{TNHWRP^fXh`(?pU<+Hc>^
zi8}&V1KTt$v$5>r#qlvIyD?4nu3ELat-AVXo>OR`mYzTV>|{K?>F0R-#Xrv{NlD4W
z$w_{Q#d1Yh5FNlJ;Dv3M^5dmo;5xh0#{0G}V-IXq!g5#*oB*BxY2a_5@AXgq|H8ku
WWL|pTAf&_q0000<MNUMnLSTaQ7Sn$K

literal 0
HcmV?d00001

diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
index 940ea9168..10ee252e9 100644
--- a/include/AutomatableModel.h
+++ b/include/AutomatableModel.h
@@ -133,16 +133,6 @@ public:
 
 	float controllerValue( int frameOffset ) const;
 
-	// get value always in float - for automation recording
-	inline float getValue( int frameOffset = 0 ) const
-	{
-		if( unlikely( m_hasLinkedModels || m_controllerConnection != NULL ) )
-		{
-			return controllerValue( frameOffset );
-		}
-		return m_value;
-	}
-
 	template<class T>
 	T initValue() const
 	{
diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp
index 188a2dd5f..37a6f7b27 100644
--- a/src/core/AutomationPattern.cpp
+++ b/src/core/AutomationPattern.cpp
@@ -493,7 +493,7 @@ void AutomationPattern::processMidiTime( const MidiTime & time )
 	{
 		if( time >= 0 && hasAutomation() && ! m_objects.isEmpty() )
 		{
-			const float value = static_cast<float>( firstObject()->getValue() );
+			const float value = static_cast<float>( firstObject()->value<float>() );
 			if( value != m_lastRecordedValue ) 
 			{
 				putValue( time, value, true );