I looked at the changes between 0.060 and 0.062 the last few days. There are
huge divergence in the 2 branches. The diff-file is about 1 MB. There is
definitely no possibility of automatic merging, for sure.
Being not familiar with the changes in each of the 2 brances, I don't know
which should be kept, which should be removed. Thinks like using FFTWT vs
BOOST, changes of parameter names in class variables, MIDI parameter changes...
I got huge headaches, trying to merge the changes. A few of those things are:
- synth->actionLock(lock);
- synth->actionLock(unlock);
+ synth->lockSharable();
+ synth->unlockSharable();
- tmpwavel = (float*)fftwf_malloc(synth->bufferbytes);
+ tmpwavel = new float[synth->buffersize];
- if (adpars->randomGlobalPan())
- {
- float t = synth->numRandom();
- NoteGlobalPar.randpanL = cosf(t * PI / 2.0f);
- NoteGlobalPar.randpanR = cosf((1.0f - t) * PI / 2.0f);
- }
+ NoteGlobalPar.Detune = getDetune(pars->GlobalPar.PDetuneType,
pars->GlobalPar.PCoarseDetune, pars->GlobalPar.PDetune);
+ bandwidthDetuneMultiplier = pars->getBandwidthDetuneMultiplier();
+
+ if (pars->GlobalPar.PPanning == 0)
+ NoteGlobalPar.Panning = synth->numRandom();
+ else
+ NoteGlobalPar.Panning = pars->GlobalPar.PPanning / 128.0f;
- tmpwave_unison[k] = (float*)fftwf_malloc(synth->bufferbytes);
- memset(tmpwave_unison[k], 0, synth->bufferbytes);
+ tmpwave_unison[k] = new float[synth->buffersize];
+ memset(tmpwave_unison[k], 0, synth->buffersize * sizeof(float));
- fftwf_free(tmpwavel);
+ delete [] tmpwavel;
- memset(bypassl, 0, synth->bufferbytes);
+ memset(bypassl, 0, synth->buffersize * sizeof(float));
- FFTwrapper::newFFTFREQS(&outoscilFFTfreqs, synth->halfoscilsize);
- if (!tmpsmps)
- Runtime.Log("Very bad error, failed to allocate OscilGen::tmpsmps");
- else
- memset(tmpsmps, 0, synth->oscilsize * sizeof(float));
- FFTwrapper::newFFTFREQS(&oscilFFTfreqs, synth->halfoscilsize);
- FFTwrapper::newFFTFREQS(&basefuncFFTfreqs, synth->halfoscilsize);
+ FFTwrapper::newFFTFREQS(OscilGen::outoscilFFTfreqs, synth->halfoscilsize);
+ tmpsmps = boost::shared_array<float>(new float[synth->oscilsize]);
+ memset(tmpsmps.get(), 0, synth->oscilsize * sizeof(float));
+ FFTwrapper::newFFTFREQS(oscilFFTfreqs, synth->halfoscilsize);
+ FFTwrapper::newFFTFREQS(basefuncFFTfreqs, synth->halfoscilsize);
-int OscilGen::get(float *smps, float freqHz, int resonance)
+short int OscilGen::get(float *smps, float freqHz, int resonance)
I don't really know which one is to be kept. The changes in the 0.062 UI/*.fl
files are huge, too.
Can anyone tell me which of the above are to be kept, which to be removed?
Once I know that, I can try to help with some merging.
What's better:
start with 060, apply changes from 062
or,
start with 062, apply changes from 060
I suppose the latter would be less work, since the changes in 062 are huge.
Jimmy