From 85c02cddfec701d4aa73fc438db18502922bff0b Mon Sep 17 00:00:00 2001
From: Oskar Wallgren <oskar.wallgren13@gmail.com>
Date: Thu, 22 May 2014 07:17:55 +0200
Subject: [PATCH] Random wave first commit, pixmap button defect

---
 data/themes/default/random_wave_active.png   | Bin 0 -> 533 bytes
 data/themes/default/random_wave_inactive.png | Bin 0 -> 461 bytes
 include/EnvelopeAndLfoParameters.h           |   3 +++
 src/core/EnvelopeAndLfoParameters.cpp        |  16 ++++++++++++++++
 src/gui/widgets/EnvelopeAndLfoView.cpp       |  15 ++++++++++++++-
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 data/themes/default/random_wave_active.png
 create mode 100644 data/themes/default/random_wave_inactive.png

diff --git a/data/themes/default/random_wave_active.png b/data/themes/default/random_wave_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..38b089c63d7ff48ee786656a620cae7281a88d3d
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000gE000gM0ssI2kSe-{00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-T@g7DGkK<C<Xuk0isDn
zK~yNujgrrb6G0fn>zn=)va@C-BufxPNfg8f2n0NM^Wa6)gGV7}-$C#-WFJHnQA893
z%{c}`6kR3%W_zZcp6Tw-Lvr!9b^1|N)Tw}TivWzr<1|gR)>29$0zgE}%*-JK=Uh<~
z)>;X`dvB#*_QFx2^NXSVN9ii5G_O0Zb($aq?>ztkpmp!s_SnC_pIcvkx^0^CTKsT}
z%jV64v*x#2EJ|yw5F!Ea@d+<_d6D{+D9n+cbvJYWd)Cd&1%Ha|*Y<i@ZTGA3*-hTK
z@{){OXZvz<owBt0c}M#Ls{Xp~cXf&C$|5BIhz}_+6Ntfr08q^USb!Kzpnyk@b+QZo
z>jg&Squ048;@(#TAOX-hS&1whzRk%+VM6PL5hfnKJnNjS_kPX$>cNLx{i+*NCroTV
zU#71z3Jl9?>XMQhQzx<jKmt&c{P?L4T_ta&jY$DOtUU4xfY|uP=e+kW18xw2!C(O5
z*c4S?>v;{Jx~lZNW{$q!RI@U%aX1`G03iebFi}lv1^}o@wFCLZFc5YOU^E(?=Pv&M
X*E{Jb7mi;H00000NkvXXu0mjf-<jbK

literal 0
HcmV?d00001

diff --git a/data/themes/default/random_wave_inactive.png b/data/themes/default/random_wave_inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a35c9d1667eaa5ef6db365314bae1ca263700ea
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000gE000gM0{{R3D3;yh0002(P)t-s0000W
zARr?nA|oRsFD@=GE-x=HFETMQQBhD)QBhS@RaseCU0q#YUSD8eU}$G(XlQ6@X=-U|
zYHVz5Z*OmOb#-=jc6xeyeSLj_fq{a8f`*2Mj*gCxkB^a%k&}~?l$Dg0mX(*6mzkNF
zoSdAVo}Q$nq^6~%si~=|s;aH6t*)-Fu&}VQva++Yv$V9ew6(Ohwzjvox4F5wy1Kf&
zy}Z4?y}rJ^zP`S|z`(-7!_(8#)YR1A;Na%w=I7_<=;-L{>+9_7?C$RF@9*#M@bK~R
z@$vHV^78We`T6_%`~3X;{r&y^{{H{}|E7*li2wiqn@L1LR0tha!7)z5KoCIDKeMxm
zy~s2)L2hZd|2^pFXb@E}$cYfxCObQnz<cnIF!nhq(EPHTlqS8E@aUrj%1(yT)pITJ
zwV~WuS~4qni<QKE?4t}i8VCP0>_$4xBk3T+t5PKtkK;wcNVKbY??-!@uTR~xGHq|`
z<BQjiIxQI6!|ry*zp3vNLW-0c+FEw+1mRaP3V-|n3xq_d)Kv6-00000NkvXXu0mjf
DC_V8j

literal 0
HcmV?d00001

diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
index 1d795bd9e..bcac7b812 100644
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -157,6 +157,7 @@ private:
 	float m_lfoAmount;
 	bool m_lfoAmountIsZero;
 	sample_t * m_lfoShapeData;
+	sample_t m_random;
 	bool m_bad_lfoShapeData;
 	SampleBuffer m_userWave;
 
@@ -167,11 +168,13 @@ private:
 		SawWave,
 		SquareWave,
 		UserDefinedWave,
+		RandomWave,
 		NumLfoShapes
 	} ;
 
 	sample_t lfoShapeSample( fpp_t _frame_offset );
 	void updateLfoShapeData();
+	void updateRandomWave();
 
 
 
diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp
index 668fb9d18..a709d0aea 100644
--- a/src/core/EnvelopeAndLfoParameters.cpp
+++ b/src/core/EnvelopeAndLfoParameters.cpp
@@ -218,6 +218,14 @@ inline sample_t EnvelopeAndLfoParameters::lfoShapeSample( fpp_t _frame_offset )
 		case UserDefinedWave:
 			shape_sample = m_userWave.userWaveSample( phase );
 			break;
+		case RandomWave:
+			shape_sample = m_random;
+			if( frame == 0 )
+			{
+				updateRandomWave();
+				shape_sample = m_random;
+			}
+			break;
 		case SineWave:
 		default:
 			shape_sample = Oscillator::sinSample( phase );
@@ -242,6 +250,14 @@ void EnvelopeAndLfoParameters::updateLfoShapeData()
 
 
 
+void EnvelopeAndLfoParameters::updateRandomWave()
+{
+	m_random = Oscillator::noiseSample( 0.0f );
+}
+
+
+
+
 inline void EnvelopeAndLfoParameters::fillLfoLevel( float * _buf,
 							f_cnt_t _frame,
 							const fpp_t _frames )
diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp
index 034e00d76..d44325996 100644
--- a/src/gui/widgets/EnvelopeAndLfoView.cpp
+++ b/src/gui/widgets/EnvelopeAndLfoView.cpp
@@ -250,8 +250,17 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) :
 	sqr_lfo_btn->setWhatsThis(
 		tr( "Click here for a square-wave." ) );
 
+	pixmapButton * random_lfo_btn = new pixmapButton( this, NULL );
+	random_lfo_btn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y );
+	random_lfo_btn->setActiveGraphic( embed::getIconPixmap(
+						"random_wave_active" ) );
+	random_lfo_btn->setInactiveGraphic( embed::getIconPixmap(
+						"random_wave_inactive" ) );
+	random_lfo_btn->setWhatsThis(
+		tr( "Click here for random wave." ) );
+
 	m_userLfoBtn = new pixmapButton( this, NULL );
-	m_userLfoBtn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y );
+	m_userLfoBtn->move( LFO_SHAPES_X+75, LFO_SHAPES_Y );
 	m_userLfoBtn->setActiveGraphic( embed::getIconPixmap(
 							"usr_wave_active" ) );
 	m_userLfoBtn->setInactiveGraphic( embed::getIconPixmap(
@@ -269,6 +278,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) :
 	m_lfoWaveBtnGrp->addButton( triangle_lfo_btn );
 	m_lfoWaveBtnGrp->addButton( saw_lfo_btn );
 	m_lfoWaveBtnGrp->addButton( sqr_lfo_btn );
+	m_lfoWaveBtnGrp->addButton( random_lfo_btn );
 	m_lfoWaveBtnGrp->addButton( m_userLfoBtn );
 
 
@@ -525,6 +535,9 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * )
 				case EnvelopeAndLfoParameters::SquareWave:
 					val = Oscillator::squareSample( phase );
 					break;
+				case EnvelopeAndLfoParameters::RandomWave:
+					val = Oscillator::squareSample( phase );// <- dummy!
+					break;
 				case EnvelopeAndLfoParameters::UserDefinedWave:
 					val = m_params->m_userWave.
 							userWaveSample( phase );