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

cmRtSys.c:_cmRtDspExecCallback() now contains network update and message send.

Browse Source 
This is a cleaner representation than the original code.
This commit is contained in:
kevin 2013-04-11 00:29:55 -07:00
parent 23fcfed2fb
commit c0259b6777
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
cmRtSys.c
View File

@ -244,6 +244,22 @@ cmRtRC_t _cmRtSendStateStatusToHost( _cmRtCfg_t* cp )
return rc; return rc;
} }
// This is only called with _cmRtRecd.engMutexH locked
cmRtRC_t _cmRtDeliverMsgsWithLock( _cmRtCfg_t* cp )
{
int i;
cmRtRC_t rc = kOkThRC;
// as long as their may be a msg wating in the incoming msg queue
for(i=0; rc == kOkThRC; ++i)
{
// if a msg is waiting transmit it via cfg->cbFunc()
if((rc = cmTsMp1cDequeueMsg(cp->htdQueueH,NULL,0)) == kOkThRC)
++cp->status.msgCbCnt;
}
return rc;
}
// The DSP execution callback happens through this function. // The DSP execution callback happens through this function.
// This function is only called from inside _cmRtThreadCallback() // This function is only called from inside _cmRtThreadCallback()
@ -258,6 +274,20 @@ void _cmRtDspExecCallback( _cmRtCfg_t* cp )
// 3) All samples returned in oChArray[] buffers will be set to zero. // 3) All samples returned in oChArray[] buffers will be set to zero.
cmApBufGetIO(cp->ss.args.inDevIdx, cp->ctx.iChArray, cp->ctx.iChCnt, cp->ss.args.outDevIdx, cp->ctx.oChArray, cp->ctx.oChCnt ); cmApBufGetIO(cp->ss.args.inDevIdx, cp->ctx.iChArray, cp->ctx.iChCnt, cp->ss.args.outDevIdx, cp->ctx.oChArray, cp->ctx.oChCnt );
// calling this function results in callbacks to _gtNetRecv()
// which in turn calls cmRtSysDeliverMsg() which queues any incoming messages
// which are then transferred to the DSP processes by the the call to
// _cmRtDeliverMsgWithLock() below.
if( cp->cbEnableFl )
cmUdpGetAvailData(cp->udpH,NULL,NULL,NULL);
// if there are msgs waiting to be sent to the DSP process send them.
if( cp->cbEnableFl )
if( cmTsMp1cMsgWaiting(cp->htdQueueH) )
_cmRtDeliverMsgsWithLock(cp);
// call the application provided DSP process // call the application provided DSP process
if( cp->cbEnableFl ) if( cp->cbEnableFl )
{ {
@ -318,22 +348,6 @@ bool _cmRtBufIsReady( const _cmRtCfg_t* cp )
} }
// This is only called with _cmRtRecd.engMutexH locked
cmRtRC_t _cmRtDeliverMsgsWithLock( _cmRtCfg_t* cp )
{
int i;
cmRtRC_t rc = kOkThRC;
// as long as their may be a msg wating in the incoming msg queue
for(i=0; rc == kOkThRC; ++i)
{
// if a msg is waiting transmit it via cfg->cbFunc()
if((rc = cmTsMp1cDequeueMsg(cp->htdQueueH,NULL,0)) == kOkThRC)
++cp->status.msgCbCnt;
}
return rc;
}
// This is the main audio system loop (and thread callback function). // This is the main audio system loop (and thread callback function).
@ -381,17 +395,6 @@ bool _cmRtThreadCallback(void* arg)
{ {
++cp->status.audioCbCnt; ++cp->status.audioCbCnt;
// calling this function results in callbacks to _gtNetRecv()
// which in turn calls cmRtSysDeliverMsg() which queues any incoming messages
// which are then transferred to the DSP processes by the the call to
// _cmRtDeliverMsgWithLock() below.
if( cp->cbEnableFl )
cmUdpGetAvailData(cp->udpH,NULL,NULL,NULL);
// if there are msgs waiting to be sent to the DSP process send them.
if( cp->cbEnableFl )
if( cmTsMp1cMsgWaiting(cp->htdQueueH) )
_cmRtDeliverMsgsWithLock(cp);
// make the cmRtSys callback // make the cmRtSys callback
_cmRtDspExecCallback( cp ); _cmRtDspExecCallback( cp );