eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some fixes

Browse source
This commit is contained in:
Volker Fischer 2008-07-13 13:16:31 +00:00
parent 044c4a9a54
commit 6b81e2ce55
2 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client.cpp
View file

@ -372,6 +372,20 @@ fflush(pFileDelay);
ResampleObjUpL.Resample ( vecdAudioL, vecdAudioSndCrdL ); ResampleObjUpL.Resample ( vecdAudioL, vecdAudioSndCrdL );
ResampleObjUpR.Resample ( vecdAudioR, vecdAudioSndCrdR ); ResampleObjUpR.Resample ( vecdAudioR, vecdAudioSndCrdR );
// TEST play sinusoidal signal for testing
static int iCnt = 0;
for ( i = 0; i < iSndCrdBlockSizeSam; i++ )
{
vecdAudioSndCrdL[i] = sin(6 * double(iCnt) / 48000 * 2000) * 22000;
vecdAudioSndCrdR[i] = vecdAudioSndCrdL[i];
iCnt++;
}
// copy data from one stereo buffer in two separate buffers // copy data from one stereo buffer in two separate buffers
iInCnt = 0; iInCnt = 0;
for ( i = 0; i < iSndCrdBlockSizeSam; i++ ) for ( i = 0; i < iSndCrdBlockSizeSam; i++ )

61
windows/sound.cpp
View file

@ -305,15 +305,32 @@ if ( iASIOBufferSizeMono != iBufferSizeMono )
throw CGenErr ( "Required sound card buffer size not allowed by the audio hardware." ); throw CGenErr ( "Required sound card buffer size not allowed by the audio hardware." );
} }
// prepare input channels
for ( i = 0; i < NUM_IN_OUT_CHANNELS; i++ )
{
bufferInfos[i].isInput = ASIOTrue;
bufferInfos[i].channelNum = i;
bufferInfos[i].buffers[0] = 0;
bufferInfos[i].buffers[1] = 0;
}
// prepare output channels
for ( i = 0; i < NUM_IN_OUT_CHANNELS; i++ )
{
bufferInfos[NUM_IN_OUT_CHANNELS + i].isInput = ASIOFalse;
bufferInfos[NUM_IN_OUT_CHANNELS + i].channelNum = i;
bufferInfos[NUM_IN_OUT_CHANNELS + i].buffers[0] = 0;
bufferInfos[NUM_IN_OUT_CHANNELS + i].buffers[1] = 0;
}
// create and activate ASIO buffers (buffer size in samples) // create and activate ASIO buffers (buffer size in samples)
ASIOCreateBuffers ( bufferInfos, 2 * NUM_IN_OUT_CHANNELS, ASIOCreateBuffers ( bufferInfos, 2 /* in/out */ * NUM_IN_OUT_CHANNELS /* stereo */,
iASIOBufferSizeMono, &asioCallbacks ); iASIOBufferSizeMono, &asioCallbacks );
// now set all the buffer details // now get some buffer details
for ( i = 0; i < 2 * NUM_IN_OUT_CHANNELS; i++ ) for ( i = 0; i < 2 * NUM_IN_OUT_CHANNELS; i++ )
{ {
channelInfos[i].channel = NUM_IN_OUT_CHANNELS; channelInfos[i].channel = bufferInfos[i].channelNum;
channelInfos[i].isInput = bufferInfos[i].isInput; channelInfos[i].isInput = bufferInfos[i].isInput;
ASIOGetChannelInfo ( &channelInfos[i] ); ASIOGetChannelInfo ( &channelInfos[i] );
@ -484,24 +501,6 @@ pstrDevices[0] = driverInfo.name;
asioCallbacks.asioMessage = &asioMessages; asioCallbacks.asioMessage = &asioMessages;
asioCallbacks.bufferSwitchTimeInfo = &bufferSwitchTimeInfo; asioCallbacks.bufferSwitchTimeInfo = &bufferSwitchTimeInfo;
// prepare input channels
for ( i = 0; i < NUM_IN_OUT_CHANNELS; i++ )
{
bufferInfos[i].isInput = ASIOTrue;
bufferInfos[i].channelNum = i;
bufferInfos[i].buffers[0] = 0;
bufferInfos[i].buffers[1] = 0;
}
// prepare output channels
for ( i = 0; i < NUM_IN_OUT_CHANNELS; i++ )
{
bufferInfos[NUM_IN_OUT_CHANNELS + i].isInput = ASIOFalse;
bufferInfos[NUM_IN_OUT_CHANNELS + i].channelNum = i;
bufferInfos[NUM_IN_OUT_CHANNELS + i].buffers[0] = 0;
bufferInfos[NUM_IN_OUT_CHANNELS + i].buffers[1] = 0;
}
// init buffer pointer to zero // init buffer pointer to zero
for ( i = 0; i < MAX_SND_BUF_IN; i++ ) for ( i = 0; i < MAX_SND_BUF_IN; i++ )
{ {
@ -607,16 +606,6 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
// Manage thread interface buffers for input and output ---------------- // Manage thread interface buffers for input and output ----------------
// capture
if ( iInCurBlockToWrite < iCurNumSndBufIn )
{
iInCurBlockToWrite++;
}
else
{
// TODO: buffer overrun, inform user somehow...?
}
// playback // playback
if ( iOutCurBlockToWrite > 0 ) if ( iOutCurBlockToWrite > 0 )
{ {
@ -637,6 +626,16 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
{ {
// TODO: buffer underrun, inform user somehow...? // TODO: buffer underrun, inform user somehow...?
} }
// capture
if ( iInCurBlockToWrite < iCurNumSndBufIn )
{
iInCurBlockToWrite++;
}
else
{
// TODO: buffer overrun, inform user somehow...?
}
} }
ASIOMutex.unlock(); ASIOMutex.unlock();