From 19d01280ed63d7624193fee013e6fac0cc31d1d7 Mon Sep 17 00:00:00 2001
From: Andreas Brandmaier <andy@brandmaier.de>
Date: Thu, 16 Mar 2006 14:37:24 +0000
Subject: [PATCH] added randomise button to organic

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@107 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                     |   7 +++++
 plugins/organic/organic.cpp   |  49 ++++++++++++++++++++++++++++++++++
 plugins/organic/organic.h     |  11 +++++---
 plugins/organic/randomise.png | Bin 0 -> 1119 bytes
 4 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 plugins/organic/randomise.png

diff --git a/ChangeLog b/ChangeLog
index c84dc7944..7a429b93d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-16	Andreas Brandmaier <andreas/at/brandmaier/dot/de>
+
+	* plugins/organic/organic.cpp
+	* plugins/organic/organic.h
+	* plugins/organic/randomise.png
+	added "randomise preset" button to organic plugin
+
 2006-03-14	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* include/types.h:
diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
index c901f8c53..d64ab3e01 100644
--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -179,7 +179,21 @@ organicInstrument::organicInstrument( channelTrack * _channel_track ) :
 		volKnob->setInitValue( 100 );
 		volKnob->setHintText( tr( "Osc %1 volume:" ).arg(
 							1 ) + " ", "%" );
+							
+		// randomise
+		m_randBtn = new pixmapButton( this );
+		m_randBtn->move( 100, 200 );
+		m_randBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
+								"randomise" ) );
+		m_randBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
+							"randomise" ) );
+		//m_randBtn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ).
+		//				createHeuristicMask() ) );
 
+		connect( m_randBtn, SIGNAL ( toggled(bool) ),
+			this, SLOT( randomiseSettings() ) );
+
+	// set harmonics
 
 	m_osc[0].harmonic = 0.5f;	//	one octave below
 	m_osc[1].harmonic = 0.75f;	//	a fifth below
@@ -479,6 +493,41 @@ void organicInstrument::oscButtonChanged( )
 	}
 }
 
+void organicInstrument::randomiseSettings()
+{
+	
+	for (int i=0; i < m_num_oscillators; i++)
+	{
+		m_osc[i].volKnob->setValue( 
+			intRand(0,100)
+		 );
+	
+		m_osc[i].detuneKnob->setValue( 
+			intRand(-5, 5)
+		 );
+	
+		m_osc[i].panKnob->setValue( 
+			//(int)gaussRand(PANNING_LEFT, PANNING_RIGHT,1,0)
+			0
+		  );
+		  
+		m_osc[i].oscKnob->setValue(  
+			intRand(0, 5)
+		);	
+	}
+	
+}
+
+int organicInstrument::intRand( int min, int max )
+{
+//	int randn = min+int((max-min)*rand()/(RAND_MAX + 1.0));	
+//	cout << randn << endl;
+	int randn = ( rand() % (max-min) ) + min ;
+	return randn;
+}
+
+
+
 
 extern "C"
 {
diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h
index 15cf2c18c..63b44a8f2 100644
--- a/plugins/organic/organic.h
+++ b/plugins/organic/organic.h
@@ -66,17 +66,19 @@ public:
 	virtual void FASTCALL loadSettings( const QDomElement & _this );
 
 	virtual QString nodeName( void ) const;
+	
+	int intRand( int min, int max );
+
 
 public slots:
 
 	void oscButtonChanged( void );
+	void randomiseSettings();
 
 private:
 
-	float foldback(float in, float threshold);
-	float saturate(float x, float t);
-	float distort(float in, float dist);
-	float waveshape(float in, float amount);
+	float inline waveshape(float in, float amount);
+
 	
 	// fast atan, fast rather than accurate
 	inline float fastatan( float x )
@@ -108,6 +110,7 @@ private:
 
 		knob * fx1Knob;
 		knob * volKnob;
+		pixmapButton * m_randBtn;
 
 } ;
 
diff --git a/plugins/organic/randomise.png b/plugins/organic/randomise.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b18872b01e20bed24d929c43cc6b5dce9c12af6
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq002e+000jN0ssI2)*CK&00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-Xc0Td$!yGoJY0000TbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAXI2&AV*0}Q14_VZU6uS)k#D_R7l5T6f9>LW`Oa~|NX<sKmHYtObo*g3_~xm
zz**1VKF#Qkkr0+*U|?YQ|DThcD<`;AMMj-GbKie{S1>VUVa+=7w152ip=o|aZ_W&g
zyu`r3z`@2bvvethedflAxm%{TXG|K9kmlzWAkRPOUP1<nlFBdMJ%g|>-90~N)8rq&
zfBgUdFUmE^(a7!n=XbgNi7qByC$1j;_Va73d#bCc*V~V;r>^UL@cb?tE4#UtHQcDz
zA6`vg-}mU{eMUw`J!PX*zufOXzvuKP*yuW5ymR*Bm-hj7;rE{1x&Qpm_n+UQToXMl
z{2}HqsoTiFz_8=wrj3VJ|NHlsiHSMUE7MHN>f@IWGdE7W|NPFc-@jC3)YAO(h51AX
zc<KND|7UKVloMBkaA$9t6z&{nqvv?%$<5BC^^Qhv3=9lkzJHdNP)zVjzi|7^<Tc%{
zre3`(TJ)5SY7^T3{`)&+Z8zMsz7;K|npP0;sq1<c@0=6j5dG!bXEQCU%)r8nch1$#
zDXvfIG*UCWc<1b-)m@$z{&2nDetey~W!jwb75qE`cb?o_dtjNFmes`79U%@;T8euA
z|Nq~4YV*{!J#~p4*uC`Q*N?2;I0goW-+z9;{rI{*sS6@LsbJotm-kOxJ$(Jam0!Pq
zK?K=Z*&PgB85kJkC6xaB{r&Cdw_A^|H>LD4GBUC-vjjUtoxgROfq~)s&u@30+-ynf
zhl<-rwl1m(afs&O<TX||XJBBE6PM@b7BEsXV_;yA6Ib~2_cv-@;8c=QnXsx|SJ_Ze
zN~I*S_Q$X9=Wm~er=b7;|Fg2N;mb?YiWfoHr>`HIzjfM#{5k*s|F4}>EGaClt88GP
zYI5NGZioU_7B)skMnnb2z`)3W!i8Fikp%wz`^&(<fTWiZnT=i|Gck2!On&g<-rc9S
z_MX|k_1L<ih#FRA)~Q7ck!>fc5Lb~=fA{Gv0|Ud?A75@hyqe^lX{+b-=Hu&s|Ns5}
zkLgYZPIfL8S&cROm;V3%|L@;FYYr@fh;y-XDM_ntI<n^f|Nnpf{#kQinX!fi@p=8n
zuOF$M5uyTOE+(EnRzXi+KjvcRQkGHQe00tK|NsC0|G#L*>}l)!h$<eqIe5PQ_;UQp
zVM`rbcXQv2?ihX^L1$wRE)MQ#>-(Zy6EU?Eg;!5q*OS~H_V53H3vC;?cyUDSv~@jO
zj;>>5WYAMFj`K+U{_{JLUgBWm@UsamoRrGS!p6$Nn(m*^z`#%vQ8R6Q-^Rmhn3$L}
l6?8KE3q~76qYa_~2LSAwp$+gZ{g(g$002ovPDHLkV1lrOMRNcE

literal 0
HcmV?d00001