zynaddsubfx

commit 852cd8a0ffe62fdae8b5e717dafcde1c5bbe9bbf
parent 9fe29cc9f798bc7d6ffa15abf9d70b044ea21270
Author: paulnasca <paulnasca>
Date:   Wed, 25 Aug 2004 19:17:28 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
+-
M
src/Misc/Part.C
 | 
2
+-
M
src/Synth/OscilGen.C
 | 
8
++++----

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -704,6 +704,6 @@
 24 Aug 2004 - Inlaturat complet suportul pentru formatele *.mas_zyn, *.ins_zyn, *.bnk_zyn si *.scl_zyn
 	    - Ascuns Sequencer-ul de utilizator (o sa il continui mai incolo)
 25 Aug 2004 - Listele de banci si de preset-uri sunt sortate
-
+	    - Corectate niste erori la Oscilgen care faceau ca sa se calculeze randomness chiar daca este folosit de PADsynth si pus automat parametrul randomness daca PADsynth este folosit (in caz ca se va importa la un ADsynth)
 	    
 	    
 \ No newline at end of file
diff --git a/src/Misc/Part.C b/src/Misc/Part.C
@@ -170,7 +170,7 @@ Part::~Part(){
     delete (tmpoutr);
     for (int nefx=0;nefx<NUM_PART_EFX;nefx++) 
 	delete (partefx[nefx]);
-    for (int n=0;n<NUM_PART_EFX;n++) {
+    for (int n=0;n<NUM_PART_EFX+1;n++) {
 	delete (partfxinputl[n]);
 	delete (partfxinputr[n]);
     };
diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.C
@@ -61,7 +61,8 @@ void OscilGen::defaults(){
     };
     Phmag[0]=127;
     Phmagtype=0;
-    Prand=64;//no randomness
+    if (ADvsPAD) Prand=127;//max phase randomness (usefull if the oscil will be imported to a ADsynth from a PADsynth
+	else Prand=64;//no randomness
 
     Pcurrentbasefunc=0;
     Pbasefuncpar=64;
@@ -883,7 +884,7 @@ short int OscilGen::get(REALTYPE *smps,REALTYPE freqHz,int resonance){
 
     // Randomness (each harmonic), the block type is computed 
     // in ADnote by setting start position according to this setting
-    if ((Prand>64)&&(freqHz>=0.0)){
+    if ((Prand>64)&&(freqHz>=0.0)&&(!ADvsPAD)){
         REALTYPE rnd,angle,a,b,c,d;
         rnd=PI*pow((Prand-64.0)/64.0,2.0);
         for (i=1;i<nyquist-1;i++){//to Nyquist only for AntiAliasing
@@ -901,7 +902,7 @@ short int OscilGen::get(REALTYPE *smps,REALTYPE freqHz,int resonance){
 
 
     //Harmonic Amplitude Randomness
-    if (freqHz>0.1) {
+    if ((freqHz>0.1)&&(!ADvsPAD)) {
 	unsigned int realrnd=rand();
 	srand(randseed);
 	REALTYPE power=Pamprandpower/127.0;
@@ -943,7 +944,6 @@ short int OscilGen::get(REALTYPE *smps,REALTYPE freqHz,int resonance){
     sum=sqrt(sum);
     for (int j=1;j<OSCIL_SIZE;j++) outoscilFFTfreqs[j]/=sum; 
    
-//    for (i=0;i<OSCIL_SIZE/2;i++) outoscilFFTfreqs[i+OSCIL_SIZE/2]*=-1.0;//correct the amplitude
 
     if ((ADvsPAD)&&(freqHz>0.1)){//in this case the smps will contain the freqs
         for (i=1;i<OSCIL_SIZE/2;i++) smps[i-1]=sqrt(outoscilFFTfreqs[i]*outoscilFFTfreqs[i]+outoscilFFTfreqs[OSCIL_SIZE-i]*outoscilFFTfreqs[OSCIL_SIZE-i]);