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

stability fix

Browse source
This commit is contained in:
Volker Fischer 2008-07-13 20:03:37 +00:00
parent 2ce29103c6
commit 94d6d451bc
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
windows/sound.cpp
View file

@ -69,7 +69,7 @@ int iCurNumSndBufOut;
// we must implement these functions here to get access to global variables // we must implement these functions here to get access to global variables
int CSound::GetOutNumBuf() { return iCurNumSndBufOut; } int CSound::GetOutNumBuf() { return iCurNumSndBufOut; }
int CSound::GetInNumBuf() { return iCurNumSndBufIn; } int CSound::GetInNumBuf() { return iCurNumSndBufIn; }
/******************************************************************************\ /******************************************************************************\
@ -83,10 +83,10 @@ bool CSound::Read ( CVector<short>& psData )
// check if device must be opened or reinitialized // check if device must be opened or reinitialized
if ( bChangParamIn ) if ( bChangParamIn )
{ {
// Reinit sound interface (init recording requires stereo buffer size) // reinit sound interface (init recording requires stereo buffer size)
InitRecordingAndPlayback ( iBufferSizeStereo ); InitRecordingAndPlayback ( iBufferSizeStereo );
// Reset flag // reset flag
bChangParamIn = false; bChangParamIn = false;
} }
@ -103,7 +103,7 @@ bool CSound::Read ( CVector<short>& psData )
} }
} }
// If the number of done buffers equals the total number of buffers, it is // if the number of done buffers equals the total number of buffers, it is
// very likely that a buffer got lost -> set error flag // very likely that a buffer got lost -> set error flag
bError = ( iInCurBlockToWrite == iCurNumSndBufIn ); bError = ( iInCurBlockToWrite == iCurNumSndBufIn );
@ -126,12 +126,12 @@ bool CSound::Read ( CVector<short>& psData )
// adjust "current block to write" pointer // adjust "current block to write" pointer
iInCurBlockToWrite--; iInCurBlockToWrite--;
// in case more than one buffer was ready, reset event
ResetEvent ( m_ASIOEvent );
} }
ASIOMutex.unlock(); ASIOMutex.unlock();
// in case more than one buffer was ready, reset event
ResetEvent ( m_ASIOEvent );
return bError; return bError;
} }
@ -628,18 +628,18 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
{ {
// TODO: buffer overrun, inform user somehow...? // TODO: buffer overrun, inform user somehow...?
} }
// finally if the driver supports the ASIOOutputReady() optimization,
// do it here, all data are in place
if ( bASIOPostOutput )
{
ASIOOutputReady();
}
// set event
SetEvent ( m_ASIOEvent );
} }
ASIOMutex.unlock(); ASIOMutex.unlock();
// finally if the driver supports the ASIOOutputReady() optimization,
// do it here, all data are in place
if ( bASIOPostOutput )
{
ASIOOutputReady();
}
// set event
SetEvent ( m_ASIOEvent );
} }
long CSound::asioMessages ( long selector, long value, void* message, double* opt ) long CSound::asioMessages ( long selector, long value, void* message, double* opt )