cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwWaveTableBank.cpp : PV map now fills in missing velocities between sampled velocities.

Browse Source
This commit is contained in:
kevin 2024-08-02 13:37:35 -04:00
parent c87fc2a9e4
commit 645e67fee4
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cwWaveTableBank.cpp
View File

@ -178,13 +178,13 @@ namespace cw
double hz, double hz,
double rms) double rms)
{ {
wt->tid = tid; wt->tid = tid;
wt->aN = aN; wt->aN = aN;
wt->hz = hz; wt->hz = hz;
wt->rms = rms; wt->rms = rms;
wt->cyc_per_loop = 1; wt->cyc_per_loop = 1;
wt->srate = srate; wt->srate = srate;
wt->pad_smpN = p->padSmpN; wt->pad_smpN = p->padSmpN;
wt->posn_smp_idx = posn_smp_idx; wt->posn_smp_idx = posn_smp_idx;
unsigned allocSmpCnt = p->padSmpN + wt->aN + p->padSmpN; unsigned allocSmpCnt = p->padSmpN + wt->aN + p->padSmpN;
@ -207,8 +207,14 @@ namespace cw
rc_t _create_instr_pv_map( instr_t* instr ) rc_t _create_instr_pv_map( instr_t* instr )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
instr->pvM = mem::allocZ<multi_ch_wt_seq_t*>(midi::kMidiVelCnt * midi::kMidiNoteCnt );
// each row contains the velocities for a given pitch
instr->pvM = mem::allocZ<multi_ch_wt_seq_t*>(midi::kMidiNoteCnt * midi::kMidiVelCnt );
for(unsigned i=0; i<instr->pitchN; ++i) for(unsigned i=0; i<instr->pitchN; ++i)
{
unsigned vel0 = 0;
for(unsigned j=0; j<instr->pitchA[i].velN; ++j) for(unsigned j=0; j<instr->pitchA[i].velN; ++j)
{ {
unsigned pitch = instr->pitchA[i].midi_pitch; unsigned pitch = instr->pitchA[i].midi_pitch;
@ -219,10 +225,32 @@ namespace cw
if( vel >= midi::kMidiVelCnt ) if( vel >= midi::kMidiVelCnt )
rc = cwLogError(kInvalidArgRC,"An invalid velocity value (%i) was encountered.",vel); rc = cwLogError(kInvalidArgRC,"An invalid velocity value (%i) was encountered.",vel);
multi_ch_wt_seq_t* mcs = &instr->pitchA[i].velA[j].mc_seq;
// if there is a gap between vel0 and vel
if( vel0 > 0 )
{
// find the center of the gap
unsigned vel_c = vel0 + (vel-vel0)/2;
// vel0:vel_c = mcs0
for(unsigned v=vel0+1; v<=vel_c; ++v)
{
instr->pvM[(v*midi::kMidiNoteCnt) + pitch ] = instr->pvM[(vel0*midi::kMidiNoteCnt) + pitch ];
}
// vel_c+1:vel-1 = mcs
for(unsigned v=vel_c+1; v<vel; ++v)
{
instr->pvM[(v*midi::kMidiNoteCnt) + pitch ] = mcs;
}
}
instr->pvM[(vel*midi::kMidiNoteCnt) + pitch ] = &instr->pitchA[i].velA[j].mc_seq; instr->pvM[(vel*midi::kMidiNoteCnt) + pitch ] = mcs;
vel0 = vel;
} }
}
if( rc != kOkRC ) if( rc != kOkRC )
rc = cwLogError(rc,"Pitch-velocy map creation failed on instrument:'%s'.",cwStringNullGuard(instr->label)); rc = cwLogError(rc,"Pitch-velocy map creation failed on instrument:'%s'.",cwStringNullGuard(instr->label));