cwFlowProc.cpp : Added _reset_voice() to 'poly_voice_ctl'.
Added 'load_thread_cnt' to 'piano_voice' and increased the Wave Table Bank 'padding' sample count from 1 to 2 - this fixed a Valgrind read violation. Added _finish_note() to piano_voice to force note output to zeros on all-notes-off and on decay turn-off.
This commit is contained in:
kevin
parent
8ea77f1c2f
commit
a4bc01a000
@ -1605,7 +1605,6 @@ namespace cw
|
||||
|
||||
}
|
||||
|
||||
|
||||
p->iChN = abuf->chN;
|
||||
p->igainV = mem::allocZ<coeff_t>(abuf->chN);
|
||||
|
||||
@ -2995,8 +2994,15 @@ namespace cw
|
||||
cwLogWarning("Unhandled variable id '%i' on instance: %s.", var->vid, proc->label );
|
||||
}
|
||||
|
||||
//printf("%i sd: ceil:%f expo:%f thresh:%f upr:%f lwr:%f mix:%f : rc:%i val:%f var:%s \n",
|
||||
// var->chIdx,sd->ceiling, sd->expo, sd->thresh, sd->uprSlope, sd->lwrSlope, sd->mix, rc, val, var->label );
|
||||
/*
|
||||
if( var->vid==kCeilingPId)
|
||||
{
|
||||
double secs = (double)(proc->ctx->cycleIndex * proc->ctx->framesPerCycle)/proc->ctx->sample_rate;
|
||||
|
||||
printf("%f sfx_id:%i ch:%i sd: ceil:%f expo:%f thresh:%f upr:%f lwr:%f mix:%f : rc:%i val:%f var:%s \n",
|
||||
secs,proc->label_sfx_id,var->chIdx,sd->ceiling, sd->expo, sd->thresh, sd->uprSlope, sd->lwrSlope, sd->mix, rc, val, var->label );
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
return rc;
|
||||
@ -4305,12 +4311,28 @@ namespace cw
|
||||
|
||||
unsigned midi_fld_idx;
|
||||
|
||||
bool ns_fl;
|
||||
note_state_t* nsV;
|
||||
unsigned nsN;
|
||||
unsigned ns_idx;
|
||||
} inst_t;
|
||||
|
||||
|
||||
void _reset_voice( proc_t* proc, inst_t* p, unsigned voice_idx )
|
||||
{
|
||||
p->voiceA[voice_idx].activeFl = false;
|
||||
p->voiceA[voice_idx].pitch = midi::kInvalidMidiPitch;
|
||||
|
||||
if( p->ns_fl )
|
||||
_store_note_state( proc, p, 0, 0, 0, 0, voice_idx );
|
||||
}
|
||||
|
||||
void _reset_all_voices( proc_t* proc, inst_t* p )
|
||||
{
|
||||
for(unsigned i=0; i<p->voiceN; ++i)
|
||||
_reset_voice(proc,p,i);
|
||||
}
|
||||
|
||||
rc_t _create( proc_t* proc, inst_t* p )
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
@ -4361,6 +4383,7 @@ namespace cw
|
||||
p->nsN = 500;
|
||||
p->nsV = mem::allocZ<note_state_t>(p->nsN);
|
||||
|
||||
_reset_all_voices(proc,p);
|
||||
|
||||
errLabel:
|
||||
return rc;
|
||||
@ -4370,14 +4393,15 @@ namespace cw
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
|
||||
char fname[255];
|
||||
snprintf(fname,255,"/home/kevin/temp/note_state/vctl.csv");
|
||||
_write_note_state( proc, p, fname );
|
||||
//char fname[255];
|
||||
//snprintf(fname,255,"/home/kevin/temp/note_state/vctl.csv");
|
||||
//_write_note_state( proc, p, fname );
|
||||
|
||||
for(unsigned i=0; i<p->voiceN; ++i)
|
||||
mem::release(p->voiceA[i].msgA);
|
||||
|
||||
mem::release( p->voiceA );
|
||||
mem::release( p->nsV );
|
||||
p->voiceN = 0;
|
||||
return rc;
|
||||
}
|
||||
@ -4471,6 +4495,7 @@ namespace cw
|
||||
|
||||
rc = _update_voice_msg(proc,p,voice_idx,m);
|
||||
|
||||
if( p->ns_fl )
|
||||
_store_note_state( proc, p, m->uid, midi::kNoteOnMdId, m->d0, m->d1, voice_idx );
|
||||
|
||||
return rc;
|
||||
@ -4486,6 +4511,7 @@ namespace cw
|
||||
|
||||
rc = _update_voice_msg(proc,p,i,m);
|
||||
|
||||
if( p->ns_fl )
|
||||
_store_note_state( proc, p, m->uid, midi::kNoteOffMdId, m->d0, 0, i );
|
||||
|
||||
goto errLabel;
|
||||
@ -4517,21 +4543,20 @@ namespace cw
|
||||
rc_t rc = kOkRC;
|
||||
rbuf_t* rbuf = nullptr;
|
||||
|
||||
// update the voice array
|
||||
// update the state of each voice
|
||||
for(unsigned i=0; i<p->voiceN; ++i)
|
||||
{
|
||||
bool done_fl;
|
||||
|
||||
var_get(proc,p->baseDoneFlPId+i,kAnyChIdx,done_fl);
|
||||
|
||||
// notice notes that have transitioned from 'active' to 'inactive'
|
||||
if( p->voiceA[i].activeFl && done_fl )
|
||||
{
|
||||
p->voiceA[i].activeFl = false;
|
||||
p->voiceA[i].pitch = midi::kInvalidMidiPitch;
|
||||
|
||||
_store_note_state( proc, p, 0, 0, 0, 0, i );
|
||||
_reset_voice(proc,p,i);
|
||||
}
|
||||
|
||||
// track the age of the voice
|
||||
if( p->voiceA[i].activeFl )
|
||||
p->voiceA[i].age += 1;
|
||||
|
||||
@ -4848,6 +4873,7 @@ namespace cw
|
||||
kInPId,
|
||||
kOutPId,
|
||||
kDoneFlPId,
|
||||
kLoadThreadCntPId,
|
||||
kTestPitchPId,
|
||||
kKeyPitchPId,
|
||||
};
|
||||
@ -4887,12 +4913,12 @@ namespace cw
|
||||
} inst_t;
|
||||
|
||||
|
||||
rc_t _load_wtb(proc_t* proc, inst_t* p, const char* wtb_fname)
|
||||
rc_t _load_wtb(proc_t* proc, inst_t* p, const char* wtb_fname, unsigned load_thread_cnt)
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
const char* wtb_var_label = "wtb";
|
||||
char* exp_wtb_fname = nullptr;
|
||||
unsigned padSmpN = 1;
|
||||
unsigned padSmpN = 2;
|
||||
|
||||
// if the global wave table bank has not yet been created
|
||||
if((p->wtbH_ptr = (wt_bank::handle_t*)global_var(proc, wtb_var_label )) == nullptr )
|
||||
@ -4906,7 +4932,7 @@ namespace cw
|
||||
}
|
||||
|
||||
// create the wave table bank
|
||||
if((rc = create( wtbH, padSmpN, exp_wtb_fname)) != kOkRC )
|
||||
if((rc = create( wtbH, padSmpN, exp_wtb_fname, load_thread_cnt )) != kOkRC )
|
||||
{
|
||||
rc = cwLogError(rc,"The wave table bank global variable creation failed.");
|
||||
goto errLabel;
|
||||
@ -4965,6 +4991,7 @@ namespace cw
|
||||
mbuf_t* mbuf = nullptr;
|
||||
bool done_fl = false;
|
||||
srate_t srate = proc->ctx->sample_rate;
|
||||
unsigned load_thread_cnt = 16;
|
||||
|
||||
// get the MIDI input variable
|
||||
if((rc = var_register_and_get( proc, kAnyChIdx,
|
||||
@ -4972,6 +4999,7 @@ namespace cw
|
||||
kWtbInstrPId, "wtb_instr", kBaseSfxId, wtb_instr,
|
||||
kInPId, "in", kBaseSfxId, mbuf,
|
||||
kDoneFlPId, "done_fl", kBaseSfxId, done_fl,
|
||||
kLoadThreadCntPId,"load_thread_cnt", kBaseSfxId, load_thread_cnt,
|
||||
kTestPitchPId, "test_pitch",kBaseSfxId, p->test_pitch,
|
||||
kKeyPitchPId, "test_key_pitch", kBaseSfxId, p->test_key_pitch)) != kOkRC )
|
||||
{
|
||||
@ -4979,7 +5007,7 @@ namespace cw
|
||||
}
|
||||
|
||||
// get the wave table bank handle (p->wtbH_ptr(
|
||||
if((rc = _load_wtb(proc, p, wtb_fname)) != kOkRC )
|
||||
if((rc = _load_wtb(proc, p, wtb_fname, load_thread_cnt)) != kOkRC )
|
||||
{
|
||||
goto errLabel;
|
||||
}
|
||||
@ -5099,14 +5127,15 @@ namespace cw
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
|
||||
char fname[255];
|
||||
snprintf(fname,255,"/home/kevin/temp/note_state/%i.csv",proc->label_sfx_id);
|
||||
_write_note_state( proc, p, fname );
|
||||
//char fname[255];
|
||||
//snprintf(fname,255,"/home/kevin/temp/note_state/%i.csv",proc->label_sfx_id);
|
||||
//_write_note_state( proc, p, fname );
|
||||
mem::release(p->nsV);
|
||||
|
||||
if( p->wtbH_ptr )
|
||||
destroy(*p->wtbH_ptr);
|
||||
|
||||
destroy(&p->osc);
|
||||
mem::release(p->test_pitch_map);
|
||||
|
||||
return rc;
|
||||
@ -5118,6 +5147,14 @@ namespace cw
|
||||
return rc;
|
||||
}
|
||||
|
||||
void _finish_note( proc_t* proc, inst_t* p )
|
||||
{
|
||||
p->done_fl = true;
|
||||
var_set(proc,kDoneFlPId,kAnyChIdx,true);
|
||||
_store_note_state(proc, p, 0, 0, p->pitch, 0);
|
||||
p->gain_coeff = 0.0; //
|
||||
}
|
||||
|
||||
rc_t _exec( proc_t* proc, inst_t* p )
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
@ -5167,6 +5204,11 @@ namespace cw
|
||||
case midi::kCtlMdId:
|
||||
if( midi::isSustainPedal( m->status, m->d0 ) )
|
||||
_on_sustain_pedal(proc,p, midi::isPedalDown(m->d1) );
|
||||
else
|
||||
{
|
||||
if( midi::isAllNotesOff( m->status, m->d0) )
|
||||
_finish_note(proc,p);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -5185,10 +5227,7 @@ namespace cw
|
||||
|
||||
if( (p->gain < p->kGainThreshold && !p->done_fl) /*|| (actualFrmN < abuf->frameN)*/ )
|
||||
{
|
||||
p->done_fl = true;
|
||||
var_set(proc,kDoneFlPId,kAnyChIdx,true);
|
||||
_store_note_state(proc, p, 0, 0, p->pitch, 0);
|
||||
|
||||
_finish_note(proc,p);
|
||||
}
|
||||
|
||||
errLabel:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user