Browse Source

Final zyn changes, builds again

tags/1.9.4
falkTX 12 years ago
parent
commit
3bbbefaa9b
4 changed files with 9 additions and 9 deletions
  1. +2
    -2
      source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp
  2. +5
    -5
      source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp
  3. +1
    -1
      source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp
  4. +1
    -1
      source/modules/native-plugins/zynaddsubfx/globals.h

+ 2
- 2
source/modules/native-plugins/zynaddsubfx/DSP/Unison.cpp View File

@@ -92,11 +92,11 @@ void Unison::updateParameters(void)
/ (float) update_period_samples;
// printf("#%g, %g\n",increments_per_second,base_freq);
for(int i = 0; i < unison_size; ++i) {
float base = powf(UNISON_FREQ_SPAN, numRandom() * 2.0f - 1.0f);
float base = powf(UNISON_FREQ_SPAN, SYNTH_T::numRandom() * 2.0f - 1.0f);
uv[i].relative_amplitude = base;
float period = base / base_freq;
float m = 4.0f / (period * increments_per_second);
if(numRandom() < 0.5f)
if(SYNTH_T::numRandom() < 0.5f)
m = -m;
uv[i].step = m;
// printf("%g %g\n",uv[i].relative_amplitude,period);


+ 5
- 5
source/modules/native-plugins/zynaddsubfx/Misc/Part.cpp View File

@@ -153,21 +153,21 @@ void Part::defaultsinstrument()
/*
* Cleanup the part
*/
void Part::cleanup(bool final)
void Part::cleanup(bool final_)
{
for(int k = 0; k < POLIPHONY; ++k)
KillNotePos(k);
for(int i = 0; i < synth->buffersize; ++i) {
partoutl[i] = final ? 0.0f : denormalkillbuf[i];
partoutr[i] = final ? 0.0f : denormalkillbuf[i];
partoutl[i] = final_ ? 0.0f : denormalkillbuf[i];
partoutr[i] = final_ ? 0.0f : denormalkillbuf[i];
}
ctl.resetall();
for(int nefx = 0; nefx < NUM_PART_EFX; ++nefx)
partefx[nefx]->cleanup();
for(int n = 0; n < NUM_PART_EFX + 1; ++n)
for(int i = 0; i < synth->buffersize; ++i) {
partfxinputl[n][i] = final ? 0.0f : denormalkillbuf[i];
partfxinputr[n][i] = final ? 0.0f : denormalkillbuf[i];
partfxinputl[n][i] = final_ ? 0.0f : denormalkillbuf[i];
partfxinputr[n][i] = final_ ? 0.0f : denormalkillbuf[i];
}
}



+ 1
- 1
source/modules/native-plugins/zynaddsubfx/Misc/Util.cpp View File

@@ -203,7 +203,7 @@ void clearTmpBuffers(void)
pool.clear();
}

float SYNTH_T::numRandom() const
float SYNTH_T::numRandom()
{
return RND;
}


+ 1
- 1
source/modules/native-plugins/zynaddsubfx/globals.h View File

@@ -242,7 +242,7 @@ struct SYNTH_T {
bufferbytes = buffersize * sizeof(float);
oscilsize_f = oscilsize;
}
float numRandom(void) const; //defined in Util.cpp for now
static float numRandom(void); //defined in Util.cpp for now
};

extern SYNTH_T *synth;


Loading…
Cancel
Save