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

cwFlow.cpp : exec_cylce() is not responsible for maintaining flow_t.cycleIndex and monitoring for early stopping via flow_t.maxCycleCount.

Browse Source
This commit is contained in:
kevin 2024-07-04 17:02:45 -04:00
parent 3616e82afa
commit ce8b9ebce4
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cwFlow.cpp
View File

@ -55,6 +55,8 @@ namespace cw
{ "audio_meter", &audio_meter::members }, { "audio_meter", &audio_meter::members },
{ "audio_marker", &audio_marker::members }, { "audio_marker", &audio_marker::members },
{ "xfade_ctl", &xfade_ctl::members }, { "xfade_ctl", &xfade_ctl::members },
{ "poly_voice_ctl", &poly_voice_ctl::members },
{ "midi_voice", &midi_voice::members },
{ "sample_hold", &sample_hold::members }, { "sample_hold", &sample_hold::members },
{ "number", &number::members }, { "number", &number::members },
{ "reg", &reg::members }, { "reg", &reg::members },
@ -848,10 +850,23 @@ unsigned cw::flow::preset_cfg_flags( handle_t h )
return flags; return flags;
} }
cw::rc_t cw::flow::exec_cycle( handle_t h ) cw::rc_t cw::flow::exec_cycle( handle_t h )
{ {
return exec_cycle(_handleToPtr(h)->net); rc_t rc = kOkRC;;
flow_t* p = _handleToPtr(h);
if( p->maxCycleCount!=kInvalidCnt && p->cycleIndex >= p->maxCycleCount )
{
rc = kEofRC;
cwLogInfo("'maxCycleCnt' reached: %i. Shutting down flow.",p->maxCycleCount);
}
else
{
rc = exec_cycle(p->net);
p->cycleIndex += 1;
}
return rc;
} }
cw::rc_t cw::flow::exec( handle_t h ) cw::rc_t cw::flow::exec( handle_t h )
@ -859,19 +874,9 @@ cw::rc_t cw::flow::exec( handle_t h )
rc_t rc = kOkRC; rc_t rc = kOkRC;
flow_t* p = _handleToPtr(h); flow_t* p = _handleToPtr(h);
for(; (p->maxCycleCount==kInvalidCnt || (p->maxCycleCount!=kInvalidCnt && p->cycleIndex < p->maxCycleCount)) && rc == kOkRC; p->cycleIndex++ ) while( rc == kOkRC )
{
rc = exec_cycle(p->net); rc = exec_cycle(p->net);
// kEofRC indicates that the network asked to terminate
if( rc == kEofRC )
break;
}
if( p->maxCycleCount != kInvalidCnt && p->cycleIndex >= p->maxCycleCount )
cwLogInfo("'maxCycleCnt' reached: %i. Shutting down flow.",p->maxCycleCount);
return rc; return rc;
} }