jens/JaySynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- simplified sync

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/JaySynth@718 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2020-08-10 16:23:38 +00:00
parent 6014af2bec
commit 7e3cdbc5ac
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/synth/lfo.c
+5 -6
View File
@@ -81,7 +81,6 @@ void Sync_init(sync_t *pObj)
{ {
pObj->phase = 0; pObj->phase = 0;
pObj->phase_ref = 0; pObj->phase_ref = 0;
pObj->phase_adjusted = 0;
pObj->omega = 0.0; pObj->omega = 0.0;
pObj->accu = 0; pObj->accu = 0;
pObj->klead = 1.0; pObj->klead = 1.0;
@@ -103,12 +102,12 @@ int Sync_process(sync_t *pObj)
{ {
do_lfo_update = 1; do_lfo_update = 1;
pObj->phase_update = 0; pObj->phase_update = 0;
perr = (synth_float_t)Sync_mod(pObj->phase - pObj->phase_ref, 1.0) - (synth_float_t)0.5; synth_float_t phase_lo = Sync_mod(pObj->phase - 0.5, 1.0);
// SynthDebug("phase_ref=%f, phase=%f, perr=%f\n", pObj->phase_ref, pObj->phase_adjusted, perr); perr = (synth_float_t)Sync_mod(phase_lo - pObj->phase_ref, 1.0) - (synth_float_t)0.5;
SynthDebug("phase_ref=%f, phase_lo=%f, perr=%f\n", pObj->phase_ref, pObj->phase, perr);
} }
pObj->phase_adjusted = Sync_mod(pObj->phase - 0.5, 1.0);
pObj->omega = -(pObj->klag*pObj->accu + pObj->klead*perr);
pObj->phase = Sync_mod(pObj->phase + pObj->omega, 1.0); pObj->phase = Sync_mod(pObj->phase + pObj->omega, 1.0);
pObj->omega = -(pObj->klag*pObj->accu + pObj->klead*perr);
pObj->accu += perr; pObj->accu += perr;
return do_lfo_update; return do_lfo_update;
@@ -279,7 +278,7 @@ synth_float_t* LFO_ProcessDataV(lfo_t *pObj, UINT32 len)
LFO_set_omega(pObj, pObj->sync.omega); LFO_set_omega(pObj, pObj->sync.omega);
SynthDebug("BPM=%f\n", pObj->sync.omega*pObj->fs*60); SynthDebug("BPM=%f\n", pObj->sync.omega*pObj->fs*60);
} }
pObj->x = pObj->sync.phase_adjusted; pObj->x = pObj->sync.phase;
in = pObj->x + pObj->offset; in = pObj->x + pObj->offset;
pObj->out = pObj->smooth_a*pObj->out + pObj->smooth_b*in; pObj->out = pObj->smooth_a*pObj->out + pObj->smooth_b*in;
Source/synth/lfo.h
-1
View File
@@ -44,7 +44,6 @@ typedef struct _ssync_t
{ {
synth_float_t phase; synth_float_t phase;
synth_float_t phase_ref; synth_float_t phase_ref;
synth_float_t phase_adjusted;
synth_float_t omega; synth_float_t omega;
synth_float_t klead; synth_float_t klead;