cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDspBuiltIn.c Added useThreadFl to WaveTable DSP Object.

Browse Source 
useThreadFl allows the background file loading thread to be enabled and disabled.
This commit is contained in:
kpl 2012-11-27 14:19:41 -08:00
parent 85e4bd0d18
commit d7578b9866
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dsp/cmDspBuiltIn.c
View File

@ -2778,6 +2778,7 @@ typedef struct
unsigned onSymId; unsigned onSymId;
unsigned offSymId; unsigned offSymId;
unsigned doneSymId; unsigned doneSymId;
bool useThreadFl;
} cmDspWaveTable_t; } cmDspWaveTable_t;
bool _cmDspWaveTableThreadFunc( void* param); bool _cmDspWaveTableThreadFunc( void* param);
@ -2823,6 +2824,8 @@ cmDspInst_t* _cmDspWaveTableAlloc(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsi
cmDspSetDefaultDouble(ctx, &p->inst, kGainWtId, 0, 1.0 ); cmDspSetDefaultDouble(ctx, &p->inst, kGainWtId, 0, 1.0 );
cmDspSetDefaultUInt( ctx, &p->inst, kFIdxWtId, 0, 0 ); cmDspSetDefaultUInt( ctx, &p->inst, kFIdxWtId, 0, 0 );
p->useThreadFl = false;
return &p->inst; return &p->inst;
} }
@ -3069,10 +3072,10 @@ cmDspRC_t _cmDspWaveTableStartFileLoadThread( cmDspCtx_t* ctx, cmDspWaveTable_t*
if( p->loadFileFl ) if( p->loadFileFl )
return cmDspInstErr(ctx,&p->inst,kInvalidStateDspRC,"The audio file '%s' was not loaded because another file is in the process of being loaded.",cmStringNullGuard(fn)); return cmDspInstErr(ctx,&p->inst,kInvalidStateDspRC,"The audio file '%s' was not loaded because another file is in the process of being loaded.",cmStringNullGuard(fn));
if(cmThreadIsValid(p->thH) == false) if(p->useThreadFl && cmThreadIsValid(p->thH) == false)
cmThreadCreate(&p->thH,_cmDspWaveTableThreadFunc,p,ctx->rpt); cmThreadCreate(&p->thH,_cmDspWaveTableThreadFunc,p,ctx->rpt);
if( cmThreadIsValid(p->thH) == false ) if(p->useThreadFl && cmThreadIsValid(p->thH) == false )
return cmDspInstErr(ctx,&p->inst,kInvalidStateDspRC,"The audio file '%s' was not loaded because the audio load thread is invalid.",cmStringNullGuard(fn)); return cmDspInstErr(ctx,&p->inst,kInvalidStateDspRC,"The audio file '%s' was not loaded because the audio load thread is invalid.",cmStringNullGuard(fn));
p->loadFileFl = true; p->loadFileFl = true;
@ -3080,7 +3083,7 @@ cmDspRC_t _cmDspWaveTableStartFileLoadThread( cmDspCtx_t* ctx, cmDspWaveTable_t*
cmDspSetUInt(ctx,&p->inst,kShapeWtId,kSilenceWtId); cmDspSetUInt(ctx,&p->inst,kShapeWtId,kSilenceWtId);
cmDspSetStrcz(ctx,&p->inst,kFnWtId,fn); cmDspSetStrcz(ctx,&p->inst,kFnWtId,fn);
if(1) if( p->useThreadFl == false )
{ {
// use non-threaded load // use non-threaded load
if((rc = _cmDspWaveTableInitAudioFile(p->ctx,p)) != kOkDspRC ) if((rc = _cmDspWaveTableInitAudioFile(p->ctx,p)) != kOkDspRC )