me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OSS: clear trigger direction bits at correct time

Browse source
This commit is contained in:
aknudsen 2008-06-05 21:13:54 +00:00
commit 700509ec31
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/hostapi/oss/pa_unix_oss.c
View file

@ -782,11 +782,15 @@ error:
return result;
}
/** Open input and output devices.
*
* @param idev: Returned input device file descriptor.
* @param odev: Returned output device file descriptor.
*/
static PaError OpenDevices( const char *idevName, const char *odevName, int *idev, int *odev )
{
PaError result = paNoError;
int flags = O_NONBLOCK, duplex = 0;
int enableBits = 0;
*idev = *odev = -1;
if( idevName && odevName )
@ -806,10 +810,6 @@ static PaError OpenDevices( const char *idevName, const char *odevName, int *ide
{
ENSURE_( *idev = open( idevName, flags ), paDeviceUnavailable );
PA_ENSURE( ModifyBlocking( *idev, 1 ) ); /* Blocking */
/* Initially disable */
enableBits = ~PCM_ENABLE_INPUT;
ENSURE_( ioctl( *idev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
}
if( odevName )
{
@ -817,10 +817,6 @@ static PaError OpenDevices( const char *idevName, const char *odevName, int *ide
{
ENSURE_( *odev = open( odevName, flags ), paDeviceUnavailable );
PA_ENSURE( ModifyBlocking( *odev, 1 ) ); /* Blocking */
/* Initially disable */
enableBits = ~PCM_ENABLE_OUTPUT;
ENSURE_( ioctl( *odev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
}
else
{
@ -973,6 +969,8 @@ static int CalcHigherLogTwo( int n )
return log2;
}
/** Configure stream component device parameters.
*/
static PaError PaOssStreamComponent_Configure( PaOssStreamComponent *component, double sampleRate, unsigned long
framesPerBuffer, StreamMode streamMode, PaOssStreamComponent *master )
{
@ -1434,6 +1432,12 @@ static PaError PaOssStream_Prepare( PaOssStream *stream )
if( stream->triggered )
return result;
/* The OSS reference instructs us to clear direction bits before setting them.*/
if( stream->playback )
ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
if( stream->capture )
ENSURE_( ioctl( stream->capture->fd, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
if( stream->playback )
{
size_t bufSz = PaOssStreamComponent_BufferSize( stream->playback );