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

cmRtSys.h/c:Changes to reflect new cmRtNet API.

Browse Source
This commit is contained in:
kpl 2013-04-28 15:21:08 -07:00
parent 63bba3ffa7
commit d8e7f5ff22
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmRtSys.c
View File

@ -634,7 +634,7 @@ cmRtRC_t _cmRtSysEnable( cmRt_t* p, bool enableFl )
{ {
_cmRtCfg_t* cp = p->ssArray + i; _cmRtCfg_t* cp = p->ssArray + i;
if( cmRtNetIsValid(cp->netH) ) if( cmRtNetIsValid(cp->netH) )
if( cmRtNetBeginSyncMode(cp->netH) != kOkNetRC ) if( cmRtNetDoSync(cp->netH) != kOkNetRC )
rc = cmErrMsg(&p->err,kNetErrRtRC,"Network Mgr. failed on entering sync mode."); rc = cmErrMsg(&p->err,kNetErrRtRC,"Network Mgr. failed on entering sync mode.");
} }
@ -944,16 +944,12 @@ cmRtRC_t cmRtSysCfg( cmRtSysH_t h, const cmRtSysSubSys_t* ss, unsigned rtSubIdx
goto errLabel; goto errLabel;
} }
// register the local and remote notes if( cmRtNetInitialize( cp->netH, ss->bcastAddr, ss->localNodeLabel, ss->localIpAddr, ss->localIpPort) != kOkNetRC )
for(j=0; j<ss->netNodeCnt; ++j)
{ {
cmRtSysNetNode_t* nn = ss->netNodeArray + j; rc = _cmRtError(p,kNetErrRtRC,"Network node initialization failed on label:%s addr:%s port:%i.",cmStringNullGuard(ss->localNodeLabel),cmStringNullGuard(ss->localIpAddr),ss->localIpPort);
if( cmRtNetRegisterLocalNode( cp->netH, nn->label, nn->ipAddr, nn->ipPort) != kOkNetRC ) goto errLabel;
{
rc = _cmRtError(p,kNetErrRtRC,"Network node allocation failed on label:%s addr:%s port:%i.",cmStringNullGuard(nn->label),cmStringNullGuard(nn->ipAddr),nn->ipPort);
goto errLabel;
}
} }
// register the local endpoints // register the local endpoints
for(j=0; j<ss->endptCnt; ++j) for(j=0; j<ss->endptCnt; ++j)

8
cmRtSys.h
View File

@ -165,9 +165,11 @@ extern "C" {
{ {
cmRtSysArgs_t args; // Audio device configuration cmRtSysArgs_t args; // Audio device configuration
cmRtCallback_t cbFunc; // DSP system entry point function. cmRtCallback_t cbFunc; // DSP system entry point function.
void* cbDataPtr; // Host provided data for the DSP system callback. void* cbDataPtr; // Host provided data for the DSP system callback.
cmRtSysNetNode_t* netNodeArray; // One node must be the local node. const cmChar_t* bcastAddr; // Network broadcast address.
unsigned netNodeCnt; // Count of network nodes or 0 to not use network const cmChar_t* localNodeLabel; // Network local node address.
const cmChar_t* localIpAddr; // Network local IP address (default:NULL to use any available address)
cmUdpPort_t localIpPort; // Network local socket port address
cmRtSysNetEndpt_t* endptArray; // Local end points cmRtSysNetEndpt_t* endptArray; // Local end points
unsigned endptCnt; // Count of local endpoints. unsigned endptCnt; // Count of local endpoints.
} cmRtSysSubSys_t; } cmRtSysSubSys_t;