|
@@ -980,46 +980,46 @@ void _cmScFolMatcherCb( cmScMatcher* p, void* arg, cmScMatcherResult_t* rp )
|
980
|
980
|
unsigned i;
|
981
|
981
|
for(i=ap->sfp->smp->vsi; i<ap->sfp->smp->nsi; ++i)
|
982
|
982
|
if(ap->sfp->smp->set[i].value != DBL_MAX )
|
983
|
|
- {
|
984
|
|
-
|
985
|
|
- switch( ap->sfp->smp->set[i].sp->varId )
|
986
|
983
|
{
|
987
|
|
- case kEvenVarScId:
|
988
|
|
- cmDspSetDouble(ap->ctx,inst,kEvenSfId,ap->sfp->smp->set[i].value);
|
989
|
|
- break;
|
990
|
984
|
|
991
|
|
- case kDynVarScId:
|
992
|
|
- cmDspSetDouble(ap->ctx,inst,kDynSfId,ap->sfp->smp->set[i].value);
|
993
|
|
- break;
|
|
985
|
+ switch( ap->sfp->smp->set[i].sp->varId )
|
|
986
|
+ {
|
|
987
|
+ case kEvenVarScId:
|
|
988
|
+ cmDspSetDouble(ap->ctx,inst,kEvenSfId,ap->sfp->smp->set[i].value);
|
|
989
|
+ break;
|
994
|
990
|
|
995
|
|
- case kTempoVarScId:
|
996
|
|
- cmDspSetDouble(ap->ctx,inst,kTempoSfId,ap->sfp->smp->set[i].value);
|
997
|
|
- break;
|
|
991
|
+ case kDynVarScId:
|
|
992
|
+ cmDspSetDouble(ap->ctx,inst,kDynSfId,ap->sfp->smp->set[i].value);
|
|
993
|
+ break;
|
998
|
994
|
|
999
|
|
- default:
|
1000
|
|
- { assert(0); }
|
1001
|
|
- }
|
|
995
|
+ case kTempoVarScId:
|
|
996
|
+ cmDspSetDouble(ap->ctx,inst,kTempoSfId,ap->sfp->smp->set[i].value);
|
|
997
|
+ break;
|
1002
|
998
|
|
1003
|
|
- cmDspSetDouble(ap->ctx,inst,kCostSfId,ap->sfp->smp->set[i].match_cost);
|
|
999
|
+ default:
|
|
1000
|
+ { assert(0); }
|
|
1001
|
+ }
|
1004
|
1002
|
|
|
1003
|
+ cmDspSetDouble(ap->ctx,inst,kCostSfId,ap->sfp->smp->set[i].match_cost);
|
1005
|
1004
|
|
1006
|
|
- // Set the values in the global variable storage
|
1007
|
|
- cmDspValue_t vv,cv;
|
1008
|
|
- unsigned j;
|
1009
|
|
- cmDsvSetDouble(&vv,ap->sfp->smp->set[i].value);
|
1010
|
|
- cmDsvSetDouble(&cv,ap->sfp->smp->set[i].match_cost);
|
1011
|
1005
|
|
1012
|
|
- for(j=0; j<ap->sfp->smp->set[i].sp->sectCnt; ++j)
|
1013
|
|
- {
|
1014
|
|
- cmDspStoreSetValueViaSym(ap->ctx->dsH, ap->sfp->smp->set[i].sp->symArray[j], &vv );
|
1015
|
|
- cmDspStoreSetValueViaSym(ap->ctx->dsH, ap->sfp->smp->set[i].sp->costSymArray[j], &cv );
|
|
1006
|
+ // Set the values in the global variable storage
|
|
1007
|
+ cmDspValue_t vv,cv;
|
|
1008
|
+ unsigned j;
|
|
1009
|
+ cmDsvSetDouble(&vv,ap->sfp->smp->set[i].value);
|
|
1010
|
+ cmDsvSetDouble(&cv,ap->sfp->smp->set[i].match_cost);
|
1016
|
1011
|
|
1017
|
|
- cmDspSetSymbol(ap->ctx,inst,kSymSfId,ap->sfp->smp->set[i].sp->symArray[j]);
|
1018
|
|
- cmDspSetSymbol(ap->ctx,inst,kSymSfId,ap->sfp->smp->set[i].sp->costSymArray[j]);
|
1019
|
|
- }
|
|
1012
|
+ for(j=0; j<ap->sfp->smp->set[i].sp->sectCnt; ++j)
|
|
1013
|
+ {
|
|
1014
|
+ cmDspStoreSetValueViaSym(ap->ctx->dsH, ap->sfp->smp->set[i].sp->symArray[j], &vv );
|
|
1015
|
+ cmDspStoreSetValueViaSym(ap->ctx->dsH, ap->sfp->smp->set[i].sp->costSymArray[j], &cv );
|
1020
|
1016
|
|
|
1017
|
+ cmDspSetSymbol(ap->ctx,inst,kSymSfId,ap->sfp->smp->set[i].sp->symArray[j]);
|
|
1018
|
+ cmDspSetSymbol(ap->ctx,inst,kSymSfId,ap->sfp->smp->set[i].sp->costSymArray[j]);
|
|
1019
|
+ }
|
1021
|
1020
|
|
1022
|
|
- }
|
|
1021
|
+
|
|
1022
|
+ }
|
1023
|
1023
|
|
1024
|
1024
|
/*
|
1025
|
1025
|
// trigger 'section' starts
|