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

cmAudioAggDev.c : Added AudioFileDevice and NRT device initialization to cmApAggTest()

Browse Source 
(Could not get Soundflower and Traveller aggregate device to work.)
This commit is contained in:
kevin 2016-05-19 13:42:30 -04:00
parent 1091f308c6
commit b04159ec47
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmAudioAggDev.c
View File

@ -6,6 +6,8 @@
#include "cmMallocDebug.h" #include "cmMallocDebug.h"
#include "cmTime.h" #include "cmTime.h"
#include "cmAudioPort.h" #include "cmAudioPort.h"
#include "cmAudioPortFile.h"
#include "cmAudioNrtDev.h"
#include "cmAudioAggDev.h" #include "cmAudioAggDev.h"
#include "cmThread.h" // cmThUIntIncr() #include "cmThread.h" // cmThUIntIncr()
@ -710,6 +712,18 @@ unsigned _cmAggGlobalOutDevIdx = 0;
void _cmApAggPortCb2( cmApAudioPacket_t* inPktArray, unsigned inPktCnt, cmApAudioPacket_t* outPktArray, unsigned outPktCnt ) void _cmApAggPortCb2( cmApAudioPacket_t* inPktArray, unsigned inPktCnt, cmApAudioPacket_t* outPktArray, unsigned outPktCnt )
{ {
if( inPktCnt )
{
cmApAggPortTestRecd* r = (cmApAggPortTestRecd*)inPktArray[0].userCbPtr;
r->cbCnt += 1;
}
if( outPktCnt )
{
cmApAggPortTestRecd* r = (cmApAggPortTestRecd*)outPktArray[0].userCbPtr;
r->cbCnt += 1;
}
cmApBufInputToOutput( _cmAggGlobalInDevIdx, _cmAggGlobalOutDevIdx ); cmApBufInputToOutput( _cmAggGlobalInDevIdx, _cmAggGlobalOutDevIdx );
cmApBufUpdate( inPktArray, inPktCnt, outPktArray, outPktCnt ); cmApBufUpdate( inPktArray, inPktCnt, outPktArray, outPktCnt );
@ -748,7 +762,7 @@ int cmApAggTest( bool runFl, cmCtx_t* ctx, int argc, const char* argv[] )
r.outDevIdx = _cmAggGlobalOutDevIdx = _cmApAggGetOpt(argc,argv,"-o",2,false); r.outDevIdx = _cmAggGlobalOutDevIdx = _cmApAggGetOpt(argc,argv,"-o",2,false);
r.phase = 0; r.phase = 0;
r.frqHz = 2000; r.frqHz = 2000;
r.srate = 44100; r.srate = 96000;
r.bufInIdx = 0; r.bufInIdx = 0;
r.bufOutIdx = 0; r.bufOutIdx = 0;
r.bufFullCnt = 0; r.bufFullCnt = 0;
@ -779,8 +793,22 @@ int cmApAggTest( bool runFl, cmCtx_t* ctx, int argc, const char* argv[] )
return 1; return 1;
} }
// allocate the audio file device system
if( cmApFileAllocate( rpt ) != kOkApRC )
{
cmRptPrintf(rpt,"The audio file device system allocation failed.\n");
goto doneLabel;
}
unsigned physDevIdxArray[] = { 0, 1 }; // allocate the NRT device system
if( cmApNrtAllocate(rpt) != kOkApRC )
{
cmRptPrintf(rpt,"The NRT audio device system allocation failed.\n");
goto doneLabel;
}
unsigned physDevIdxArray[] = { 2, 4 };
unsigned physDevCnt = sizeof(physDevIdxArray)/sizeof(physDevIdxArray[0]); unsigned physDevCnt = sizeof(physDevIdxArray)/sizeof(physDevIdxArray[0]);
if( cmApAggCreateDevice("aggdev",physDevCnt,physDevIdxArray,kInAggFl | kOutAggFl) != kOkAgRC ) if( cmApAggCreateDevice("aggdev",physDevCnt,physDevIdxArray,kInAggFl | kOutAggFl) != kOkAgRC )
{ {
@ -870,7 +898,7 @@ int cmApAggTest( bool runFl, cmCtx_t* ctx, int argc, const char* argv[] )
case 'o': case 'o':
case 'O': case 'O':
cmApBufEnableTone(r.outDevIdx,-1,kOutApFl | (c=='O'?kEnableApFl:0)); cmApBufEnableTone(r.outDevIdx,2,kOutApFl | (c=='O'?kEnableApFl:0));
break; break;
case 'p': case 'p':
@ -926,6 +954,12 @@ int cmApAggTest( bool runFl, cmCtx_t* ctx, int argc, const char* argv[] )
if( cmApFinalize() != kOkApRC ) if( cmApFinalize() != kOkApRC )
cmRptPrintf(rpt,"Finalize failed.\n"); cmRptPrintf(rpt,"Finalize failed.\n");
if( cmApNrtFree() != kOkApRC )
cmRptPrintf(rpt,"Audio NRT device system free failed.");
if( cmApFileFree() != kOkApRC )
cmRptPrintf(rpt,"Audio file device system free failed.");
if( cmApAggFree() != kOkAgRC ) if( cmApAggFree() != kOkAgRC )
cmRptPrintf(rpt,"Agg device system free failed."); cmRptPrintf(rpt,"Agg device system free failed.");