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

cmDspKr.c : Added 'post' output to cmDspScMod object.

Browse Source
This commit is contained in:
kevin 2013-09-30 11:03:47 -07:00
parent 27c719dcc4
commit de58bb5232
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dsp/cmDspKr.c
View File

@ -1158,7 +1158,8 @@ enum
{ {
kScLocIdxMdId, kScLocIdxMdId,
kResetIdxMdId, kResetIdxMdId,
kCmdMdId kCmdMdId,
kPostMdId
}; };
cmDspClass_t _cmModulatorDC; cmDspClass_t _cmModulatorDC;
@ -1172,9 +1173,10 @@ typedef struct
cmChar_t* modLabel; cmChar_t* modLabel;
unsigned onSymId; unsigned onSymId;
unsigned offSymId; unsigned offSymId;
unsigned postSymId;
} cmDspScMod_t; } cmDspScMod_t;
void _cmDspScModCb( void* arg, unsigned varSymId, double value ) void _cmDspScModCb( void* arg, unsigned varSymId, double value, bool postFl )
{ {
cmDspScMod_t* p = (cmDspScMod_t*)arg; cmDspScMod_t* p = (cmDspScMod_t*)arg;
@ -1184,6 +1186,9 @@ void _cmDspScModCb( void* arg, unsigned varSymId, double value )
cmDspSetDouble(p->tmp_ctx,&p->inst,varPtr->constId,value); cmDspSetDouble(p->tmp_ctx,&p->inst,varPtr->constId,value);
if( postFl )
cmDspSetSymbol(p->tmp_ctx,&p->inst,kPostMdId,p->postSymId);
} }
cmDspInst_t* _cmDspScModAlloc(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned storeSymId, unsigned instSymId, unsigned id, unsigned va_cnt, va_list vl ) cmDspInst_t* _cmDspScModAlloc(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned storeSymId, unsigned instSymId, unsigned id, unsigned va_cnt, va_list vl )
@ -1196,6 +1201,7 @@ cmDspInst_t* _cmDspScModAlloc(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned
{ "index", kScLocIdxMdId, 0,0, kInDsvFl | kUIntDsvFl, "Score follower index input."}, { "index", kScLocIdxMdId, 0,0, kInDsvFl | kUIntDsvFl, "Score follower index input."},
{ "reset", kResetIdxMdId, 0,0, kInDsvFl | kUIntDsvFl | kOptArgDsvFl, "Reset the modulator and go to the score index."}, { "reset", kResetIdxMdId, 0,0, kInDsvFl | kUIntDsvFl | kOptArgDsvFl, "Reset the modulator and go to the score index."},
{ "cmd", kCmdMdId, 0,0, kInDsvFl | kSymDsvFl | kOptArgDsvFl, "on | off."}, { "cmd", kCmdMdId, 0,0, kInDsvFl | kSymDsvFl | kOptArgDsvFl, "on | off."},
{ "post", kPostMdId, 0,0, kOutDsvFl | kSymDsvFl, "Sends 'post' symbol after a message transmission if the 'post' flag is set in scMod."},
{ NULL, 0, 0, 0, 0 } { NULL, 0, 0, 0, 0 }
}; };
@ -1253,6 +1259,7 @@ cmDspInst_t* _cmDspScModAlloc(cmDspCtx_t* ctx, cmDspClass_t* classPtr, unsigned
p->mp = mp; p->mp = mp;
p->onSymId = cmSymTblId(ctx->stH,"on"); p->onSymId = cmSymTblId(ctx->stH,"on");
p->offSymId = cmSymTblId(ctx->stH,"off"); p->offSymId = cmSymTblId(ctx->stH,"off");
p->postSymId = cmSymTblRegisterStaticSymbol(ctx->stH,"post");
mp->cbArg = p; // set the modulator callback arg mp->cbArg = p; // set the modulator callback arg
@ -1819,7 +1826,7 @@ cmDspRC_t _cmDspActiveMeasRecv(cmDspCtx_t* ctx, cmDspInst_t* inst, const cmDspEv
// transmit the records value and cost // transmit the records value and cost
cmDspSetDouble(ctx,inst,varId,r->value); cmDspSetDouble(ctx,inst,varId,r->value);
cmDspSetDouble(ctx,inst,kCostAmId,r->value); cmDspSetDouble(ctx,inst,kCostAmId,r->cost);
prvLoc = r->loc; prvLoc = r->loc;
} }