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

cwFlow : Added external_device_t and exec_cycle().

Browse Source
This commit is contained in:
kevin 2021-12-11 15:19:15 -05:00
parent bab059a52d
commit 1cfcbfb98d
2 changed files with 85 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cwFlow.cpp
View File

@ -23,8 +23,11 @@ namespace cw
} library_t;
library_t library[] = {
{ "audio_in", &audio_in::members },
{ "audio_out", &audio_out::members },
{ "audioFileIn", &audioFileIn::members },
{ "audioFileOut", &audioFileOut::members },
{ "sine_tone", &sine_tone::members },
{ "pv_analysis", &pv_analysis::members },
{ "pv_synthesis", &pv_synthesis::members },
{ "spec_dist", &spec_dist::members },
@ -133,7 +136,7 @@ namespace cw
vd->cfg = var_obj->pair_value();
// get the variable description
if((rc = var_obj->getv("type", type_str,
if((rc = vd->cfg->getv("type", type_str,
"doc", vd->docText)) != kOkRC )
{
rc = cwLogError(rc,"Parsing failed on class:%s variable: '%s'.", cd->label, vd->label );
@ -148,7 +151,7 @@ namespace cw
}
// get the variable description
if((rc = var_obj->getv_opt("srcFl", srcVarFl,"value",vd->val_cfg)) != kOkRC )
if((rc = vd->cfg->getv_opt("srcFl", srcVarFl,"value",vd->val_cfg)) != kOkRC )
{
rc = cwLogError(rc,"Parsing optional fields failed on class:%s variable: '%s'.", cd->label, vd->label );
goto errLabel;
@ -487,14 +490,14 @@ namespace cw
}
// get the instance class label
if((rc = inst_cfg->getv("class",pvars.inst_clas_label)) != kOkRC )
if((rc = inst_cfg->pair_value()->getv("class",pvars.inst_clas_label)) != kOkRC )
{
rc = cwLogError(kSyntaxErrorRC,"The instance cfg. %s is missing: 'type'.",pvars.inst_label);
goto errLabel;
}
// parse the optional args
if((rc = inst_cfg->getv_opt("args", arg_dict,
if((rc = inst_cfg->pair_value()->getv_opt("args", arg_dict,
"in", pvars.in_dict,
"argLabel", pvars.arg_label,
"preset", pvars.preset_labels)) != kOkRC )
@ -728,10 +731,25 @@ namespace cw
return rc;
}
rc_t _exec_cycle( flow_t* p )
{
rc_t rc = kOkRC;
for(instance_t* inst = p->network_head; inst!=nullptr; inst=inst->link)
if((rc = inst->class_desc->members->exec(inst)) != kOkRC )
break;
return rc;
}
}
}
cw::rc_t cw::flow::create( handle_t& hRef, const object_t& classCfg, const object_t& networkCfg )
cw::rc_t cw::flow::create( handle_t& hRef,
const object_t& classCfg,
const object_t& networkCfg,
external_device_t* deviceA,
unsigned deviceN )
{
rc_t rc = kOkRC;
const object_t* network;
@ -743,6 +761,8 @@ cw::rc_t cw::flow::create( handle_t& hRef, const object_t& classCfg, const objec
flow_t* p = mem::allocZ<flow_t>();
p->cfg = &networkCfg; // TODO: duplicate cfg?
p->deviceA = deviceA;
p->deviceN = deviceN;
// parse the class description array
if((rc = _parse_class_cfg(p,library,&classCfg)) != kOkRC )
@ -800,6 +820,11 @@ cw::rc_t cw::flow::create( handle_t& hRef, const object_t& classCfg, const objec
return rc;
}
cw::rc_t cw::flow::exec_cycle( handle_t& hRef )
{
return _exec_cycle(_handleToPtr(hRef));
}
cw::rc_t cw::flow::exec( handle_t& hRef )
{
rc_t rc = kOkRC;
@ -807,9 +832,7 @@ cw::rc_t cw::flow::exec( handle_t& hRef )
while( true )
{
for(instance_t* inst = p->network_head; inst!=nullptr; inst=inst->link)
if((rc = inst->class_desc->members->exec(inst)) != kOkRC )
break;
rc = _exec_cycle(p);
if( rc == kEofRC )
{

49
cwFlow.h
View File

@ -6,12 +6,53 @@ namespace cw
namespace flow
{
typedef handle<struct flow_str> handle_t;
rc_t create( handle_t& hRef, const object_t& classCfg, const object_t& networkCfg );
enum
{
kAudioDevTypeId,
kMidiDevTypeId,
kSerialDevTypeId,
kSocketDevTypeId
};
enum
{
kInFl = 0x01,
kOutFl = 0x02
};
struct abuf_str;
typedef struct audio_dev_cfg_str
{
struct abuf_str* abuf; // Buffer to receive incoming or send outgoing audio for this device
} audio_dev_cfg_t;
// Generate external device record
typedef struct external_device_str
{
const char* label; // IO framework device label
unsigned ioDevId; // IO framework device id
unsigned typeId; // see ???DevTypeId above
unsigned flags; // see ???Fl above
union
{
audio_dev_cfg_t a; // audio devices include this additional record
} u;
} external_device_t;
rc_t create( handle_t& hRef,
const object_t& classCfg,
const object_t& networkCfg,
external_device_t* deviceA = nullptr,
unsigned deviceN = 0);
rc_t exec_cycle( handle_t& hRef );
rc_t exec( handle_t& hRef );
rc_t destroy( handle_t& hRef );