Roll-up of SVN hotplug branch at most recent revision (r1677), based at the same point in the master revision history as it was originally applied.
This commit is contained in:
Ross Bencina
parent
8d0c648b7d
commit
d13fcd8ea9
27 changed files with 2117 additions and 1435 deletions
BIN
bindings/cpp/configure
vendored
BIN
bindings/cpp/configure
vendored
Binary file not shown.
|
|
@ -35,6 +35,8 @@ Pa_GetStreamReadAvailable @31
|
|||
Pa_GetStreamWriteAvailable @32
|
||||
Pa_GetSampleSize @33
|
||||
Pa_Sleep @34
|
||||
Pa_UpdateAvailableDeviceList @35
|
||||
Pa_SetDevicesChangedCallback @36
|
||||
PaAsio_GetAvailableLatencyValues @50
|
||||
PaAsio_ShowControlPanel @51
|
||||
PaUtil_InitializeX86PlainConverters @52
|
||||
|
|
|
|||
BIN
configure
vendored
BIN
configure
vendored
Binary file not shown.
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef PORTAUDIO_H
|
||||
#define PORTAUDIO_H
|
||||
/*
|
||||
* $Id$
|
||||
* $Id: portaudio.h 1670 2011-05-04 16:37:52Z rob_bielik $
|
||||
* PortAudio Portable Real-Time Audio Library
|
||||
* PortAudio API Header File
|
||||
* Latest version available at: http://www.portaudio.com/
|
||||
|
|
@ -121,9 +121,17 @@ const char *Pa_GetErrorText( PaError errorCode );
|
|||
Pairs of calls to Pa_Initialize()/Pa_Terminate() may overlap, and are not
|
||||
required to be fully nested.
|
||||
|
||||
Note that if Pa_Initialize() returns an error code, Pa_Terminate() should
|
||||
If Pa_Initialize() returns an error code, Pa_Terminate() should
|
||||
NOT be called.
|
||||
|
||||
@note The device list returned by Pa_GetDeviceCount() et al. is frozen
|
||||
at the time Pa_Initialize() is called, and not updated dynamically, even if
|
||||
hardware devices (e.g. USB or firewire devices) are connected or disconnected
|
||||
during the course of the program's lifetime. If it is required to re-scan the
|
||||
list of devices, one must call Pa_UpdateAvailableDeviceList() or, completely
|
||||
uninitialize PortAudio using Pa_Terminate(), and then reinitialize it by calling
|
||||
Pa_Initialize().
|
||||
|
||||
@return paNoError if successful, otherwise an error code indicating the cause
|
||||
of failure.
|
||||
|
||||
|
|
@ -397,6 +405,20 @@ PaDeviceIndex Pa_GetDefaultInputDevice( void );
|
|||
*/
|
||||
PaDeviceIndex Pa_GetDefaultOutputDevice( void );
|
||||
|
||||
/** Update the list of available devices to match currently available hardware devices.
|
||||
|
||||
PortAudio's list of available devices is usually frozen at the time Pa_Initialize() is
|
||||
called. Pa_UpdateAvailableDeviceList() may be called to refresh PortAudio's list
|
||||
of available devices at any time while PortAudio is initialized.
|
||||
|
||||
@note Open streams will not be affected by calls to this function, but
|
||||
any previously returned PaDeviceInfo pointers are invalidated once this
|
||||
function is called.
|
||||
|
||||
@return an error code indicating whether the device refresh was successful.
|
||||
*/
|
||||
PaError Pa_UpdateAvailableDeviceList( void );
|
||||
|
||||
|
||||
/** The type used to represent monotonic time in seconds. PaTime is
|
||||
used for the fields of the PaStreamCallbackTimeInfo argument to the
|
||||
|
|
@ -1143,6 +1165,13 @@ void Pa_Sleep( long msec );
|
|||
|
||||
|
||||
|
||||
typedef void PaDevicesChangedCallback( void *userData );
|
||||
|
||||
PaError Pa_SetDevicesChangedCallback( void *userData, PaStreamFinishedCallback* devicesChangedCallback );
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
|
|
|||
BIN
install-sh
BIN
install-sh
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_converters.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
* Portable Audio I/O Library sample conversion mechanism
|
||||
*
|
||||
* Based on the Open Source API proposed by Ross Bencina
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_front.c 1673 2011-05-06 04:40:22Z rob_bielik $
|
||||
* Portable Audio I/O Library Multi-Host API front end
|
||||
* Validate function parameters and manage multiple host APIs.
|
||||
*
|
||||
|
|
@ -80,7 +80,8 @@
|
|||
#define PA_VERSION_ 1899
|
||||
#define PA_VERSION_TEXT_ "PortAudio V19-devel (built " __DATE__ " " __TIME__ ")"
|
||||
|
||||
|
||||
extern void PaUtil_InitializeHotPlug();
|
||||
extern void PaUtil_TerminateHotPlug();
|
||||
|
||||
|
||||
int Pa_GetVersion( void )
|
||||
|
|
@ -113,16 +114,26 @@ void PaUtil_SetLastHostErrorInfo( PaHostApiTypeId hostApiType, long errorCode,
|
|||
}
|
||||
|
||||
|
||||
typedef struct _PaInternalInfo
|
||||
{
|
||||
PaUtilHostApiRepresentation **hostApis_;
|
||||
int hostApisCount_;
|
||||
int initializationCount_;
|
||||
int deviceCount_;
|
||||
|
||||
static PaUtilHostApiRepresentation **hostApis_ = 0;
|
||||
static int hostApisCount_ = 0;
|
||||
static int initializationCount_ = 0;
|
||||
static int deviceCount_ = 0;
|
||||
PaUtilStreamRepresentation *firstOpenStream_;
|
||||
|
||||
PaUtilStreamRepresentation *firstOpenStream_ = NULL;
|
||||
PaDevicesChangedCallback* devicesChangedCallback_;
|
||||
void* devicesChangedCallbackUserData_;
|
||||
|
||||
} PaInternalInfo;
|
||||
|
||||
static PaInternalInfo paInternalInfo_ = {0};
|
||||
|
||||
|
||||
#define PA_IS_INITIALISED_ (initializationCount_ != 0)
|
||||
|
||||
|
||||
#define PA_IS_INITIALISED_ (paInternalInfo_.initializationCount_ != 0)
|
||||
|
||||
|
||||
static int CountHostApiInitializers( void )
|
||||
|
|
@ -140,17 +151,17 @@ static void TerminateHostApis( void )
|
|||
/* terminate in reverse order from initialization */
|
||||
PA_DEBUG(("TerminateHostApis in \n"));
|
||||
|
||||
while( hostApisCount_ > 0 )
|
||||
while( paInternalInfo_.hostApisCount_ > 0 )
|
||||
{
|
||||
--hostApisCount_;
|
||||
hostApis_[hostApisCount_]->Terminate( hostApis_[hostApisCount_] );
|
||||
--paInternalInfo_.hostApisCount_;
|
||||
paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_]->Terminate( paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_] );
|
||||
}
|
||||
hostApisCount_ = 0;
|
||||
deviceCount_ = 0;
|
||||
paInternalInfo_.hostApisCount_ = 0;
|
||||
paInternalInfo_.deviceCount_ = 0;
|
||||
|
||||
if( hostApis_ != 0 )
|
||||
PaUtil_FreeMemory( hostApis_ );
|
||||
hostApis_ = 0;
|
||||
if( paInternalInfo_.hostApis_ != 0 )
|
||||
PaUtil_FreeMemory( paInternalInfo_.hostApis_ );
|
||||
paInternalInfo_.hostApis_ = 0;
|
||||
|
||||
PA_DEBUG(("TerminateHostApis out\n"));
|
||||
}
|
||||
|
|
@ -163,33 +174,33 @@ static PaError InitializeHostApis( void )
|
|||
|
||||
initializerCount = CountHostApiInitializers();
|
||||
|
||||
hostApis_ = (PaUtilHostApiRepresentation**)PaUtil_AllocateMemory(
|
||||
paInternalInfo_.hostApis_ = (PaUtilHostApiRepresentation**)PaUtil_AllocateMemory(
|
||||
sizeof(PaUtilHostApiRepresentation*) * initializerCount );
|
||||
if( !hostApis_ )
|
||||
if( !paInternalInfo_.hostApis_ )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
hostApisCount_ = 0;
|
||||
deviceCount_ = 0;
|
||||
paInternalInfo_.hostApisCount_ = 0;
|
||||
paInternalInfo_.deviceCount_ = 0;
|
||||
baseDeviceIndex = 0;
|
||||
|
||||
for( i=0; i< initializerCount; ++i )
|
||||
{
|
||||
hostApis_[hostApisCount_] = NULL;
|
||||
paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_] = NULL;
|
||||
|
||||
PA_DEBUG(( "before paHostApiInitializers[%d].\n",i));
|
||||
|
||||
result = paHostApiInitializers[i]( &hostApis_[hostApisCount_], hostApisCount_ );
|
||||
result = paHostApiInitializers[i]( &paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_], paInternalInfo_.hostApisCount_ );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
PA_DEBUG(( "after paHostApiInitializers[%d].\n",i));
|
||||
|
||||
if( hostApis_[hostApisCount_] )
|
||||
if( paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_] )
|
||||
{
|
||||
PaUtilHostApiRepresentation* hostApi = hostApis_[hostApisCount_];
|
||||
PaUtilHostApiRepresentation* hostApi = paInternalInfo_.hostApis_[paInternalInfo_.hostApisCount_];
|
||||
assert( hostApi->info.defaultInputDevice < hostApi->info.deviceCount );
|
||||
assert( hostApi->info.defaultOutputDevice < hostApi->info.deviceCount );
|
||||
|
||||
|
|
@ -202,9 +213,9 @@ static PaError InitializeHostApis( void )
|
|||
hostApi->info.defaultOutputDevice += baseDeviceIndex;
|
||||
|
||||
baseDeviceIndex += hostApi->info.deviceCount;
|
||||
deviceCount_ += hostApi->info.deviceCount;
|
||||
paInternalInfo_.deviceCount_ += hostApi->info.deviceCount;
|
||||
|
||||
++hostApisCount_;
|
||||
++paInternalInfo_.hostApisCount_;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -233,15 +244,15 @@ static int FindHostApi( PaDeviceIndex device, int *hostSpecificDeviceIndex )
|
|||
if( device < 0 )
|
||||
return -1;
|
||||
|
||||
while( i < hostApisCount_
|
||||
&& device >= hostApis_[i]->info.deviceCount )
|
||||
while( i < paInternalInfo_.hostApisCount_
|
||||
&& device >= paInternalInfo_.hostApis_[i]->info.deviceCount )
|
||||
{
|
||||
|
||||
device -= hostApis_[i]->info.deviceCount;
|
||||
device -= paInternalInfo_.hostApis_[i]->info.deviceCount;
|
||||
++i;
|
||||
}
|
||||
|
||||
if( i >= hostApisCount_ )
|
||||
if( i >= paInternalInfo_.hostApisCount_ )
|
||||
return -1;
|
||||
|
||||
if( hostSpecificDeviceIndex )
|
||||
|
|
@ -253,15 +264,15 @@ static int FindHostApi( PaDeviceIndex device, int *hostSpecificDeviceIndex )
|
|||
|
||||
static void AddOpenStream( PaStream* stream )
|
||||
{
|
||||
((PaUtilStreamRepresentation*)stream)->nextOpenStream = firstOpenStream_;
|
||||
firstOpenStream_ = (PaUtilStreamRepresentation*)stream;
|
||||
((PaUtilStreamRepresentation*)stream)->nextOpenStream = paInternalInfo_.firstOpenStream_;
|
||||
paInternalInfo_.firstOpenStream_ = (PaUtilStreamRepresentation*)stream;
|
||||
}
|
||||
|
||||
|
||||
static void RemoveOpenStream( PaStream* stream )
|
||||
{
|
||||
PaUtilStreamRepresentation *previous = NULL;
|
||||
PaUtilStreamRepresentation *current = firstOpenStream_;
|
||||
PaUtilStreamRepresentation *current = paInternalInfo_.firstOpenStream_;
|
||||
|
||||
while( current != NULL )
|
||||
{
|
||||
|
|
@ -269,7 +280,7 @@ static void RemoveOpenStream( PaStream* stream )
|
|||
{
|
||||
if( previous == NULL )
|
||||
{
|
||||
firstOpenStream_ = current->nextOpenStream;
|
||||
paInternalInfo_.firstOpenStream_ = current->nextOpenStream;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -291,8 +302,8 @@ static void CloseOpenStreams( void )
|
|||
/* we call Pa_CloseStream() here to ensure that the same destruction
|
||||
logic is used for automatically closed streams */
|
||||
|
||||
while( firstOpenStream_ != NULL )
|
||||
Pa_CloseStream( firstOpenStream_ );
|
||||
while( paInternalInfo_.firstOpenStream_ != NULL )
|
||||
Pa_CloseStream( paInternalInfo_.firstOpenStream_ );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -304,7 +315,7 @@ PaError Pa_Initialize( void )
|
|||
|
||||
if( PA_IS_INITIALISED_ )
|
||||
{
|
||||
++initializationCount_;
|
||||
++paInternalInfo_.initializationCount_;
|
||||
result = paNoError;
|
||||
}
|
||||
else
|
||||
|
|
@ -315,9 +326,12 @@ PaError Pa_Initialize( void )
|
|||
PaUtil_InitializeClock();
|
||||
PaUtil_ResetTraceMessages();
|
||||
|
||||
/* Initialize hot plug here, so all its internal info is setup */
|
||||
PaUtil_InitializeHotPlug();
|
||||
|
||||
result = InitializeHostApis();
|
||||
if( result == paNoError )
|
||||
++initializationCount_;
|
||||
++paInternalInfo_.initializationCount_;
|
||||
}
|
||||
|
||||
PA_LOGAPI_EXIT_PAERROR( "Pa_Initialize", result );
|
||||
|
|
@ -334,12 +348,14 @@ PaError Pa_Terminate( void )
|
|||
|
||||
if( PA_IS_INITIALISED_ )
|
||||
{
|
||||
if( --initializationCount_ == 0 )
|
||||
if( --paInternalInfo_.initializationCount_ == 0 )
|
||||
{
|
||||
CloseOpenStreams();
|
||||
|
||||
TerminateHostApis();
|
||||
|
||||
PaUtil_TerminateHotPlug();
|
||||
|
||||
PaUtil_DumpTraceMessages();
|
||||
}
|
||||
result = paNoError;
|
||||
|
|
@ -425,9 +441,9 @@ PaHostApiIndex Pa_HostApiTypeIdToHostApiIndex( PaHostApiTypeId type )
|
|||
{
|
||||
result = paHostApiNotFound;
|
||||
|
||||
for( i=0; i < hostApisCount_; ++i )
|
||||
for( i=0; i < paInternalInfo_.hostApisCount_; ++i )
|
||||
{
|
||||
if( hostApis_[i]->info.type == type )
|
||||
if( paInternalInfo_.hostApis_[i]->info.type == type )
|
||||
{
|
||||
result = i;
|
||||
break;
|
||||
|
|
@ -455,11 +471,11 @@ PaError PaUtil_GetHostApiRepresentation( struct PaUtilHostApiRepresentation **ho
|
|||
{
|
||||
result = paHostApiNotFound;
|
||||
|
||||
for( i=0; i < hostApisCount_; ++i )
|
||||
for( i=0; i < paInternalInfo_.hostApisCount_; ++i )
|
||||
{
|
||||
if( hostApis_[i]->info.type == type )
|
||||
if( paInternalInfo_.hostApis_[i]->info.type == type )
|
||||
{
|
||||
*hostApi = hostApis_[i];
|
||||
*hostApi = paInternalInfo_.hostApis_[i];
|
||||
result = paNoError;
|
||||
break;
|
||||
}
|
||||
|
|
@ -504,7 +520,7 @@ PaHostApiIndex Pa_GetHostApiCount( void )
|
|||
}
|
||||
else
|
||||
{
|
||||
result = hostApisCount_;
|
||||
result = paInternalInfo_.hostApisCount_;
|
||||
}
|
||||
|
||||
PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetHostApiCount", "PaHostApiIndex: %d", result );
|
||||
|
|
@ -530,7 +546,7 @@ PaHostApiIndex Pa_GetDefaultHostApi( void )
|
|||
/* internal consistency check: make sure that the default host api
|
||||
index is within range */
|
||||
|
||||
if( result < 0 || result >= hostApisCount_ )
|
||||
if( result < 0 || result >= paInternalInfo_.hostApisCount_ )
|
||||
{
|
||||
result = paInternalError;
|
||||
}
|
||||
|
|
@ -557,7 +573,7 @@ const PaHostApiInfo* Pa_GetHostApiInfo( PaHostApiIndex hostApi )
|
|||
PA_LOGAPI(("\tPaHostApiInfo*: NULL [ PortAudio not initialized ]\n" ));
|
||||
|
||||
}
|
||||
else if( hostApi < 0 || hostApi >= hostApisCount_ )
|
||||
else if( hostApi < 0 || hostApi >= paInternalInfo_.hostApisCount_ )
|
||||
{
|
||||
info = NULL;
|
||||
|
||||
|
|
@ -567,7 +583,7 @@ const PaHostApiInfo* Pa_GetHostApiInfo( PaHostApiIndex hostApi )
|
|||
}
|
||||
else
|
||||
{
|
||||
info = &hostApis_[hostApi]->info;
|
||||
info = &paInternalInfo_.hostApis_[hostApi]->info;
|
||||
|
||||
PA_LOGAPI(("Pa_GetHostApiInfo returned:\n" ));
|
||||
PA_LOGAPI(("\tPaHostApiInfo*: 0x%p\n", info ));
|
||||
|
|
@ -597,20 +613,20 @@ PaDeviceIndex Pa_HostApiDeviceIndexToDeviceIndex( PaHostApiIndex hostApi, int ho
|
|||
}
|
||||
else
|
||||
{
|
||||
if( hostApi < 0 || hostApi >= hostApisCount_ )
|
||||
if( hostApi < 0 || hostApi >= paInternalInfo_.hostApisCount_ )
|
||||
{
|
||||
result = paInvalidHostApi;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( hostApiDeviceIndex < 0 ||
|
||||
hostApiDeviceIndex >= hostApis_[hostApi]->info.deviceCount )
|
||||
hostApiDeviceIndex >= paInternalInfo_.hostApis_[hostApi]->info.deviceCount )
|
||||
{
|
||||
result = paInvalidDevice;
|
||||
}
|
||||
else
|
||||
{
|
||||
result = hostApis_[hostApi]->privatePaFrontInfo.baseDeviceIndex + hostApiDeviceIndex;
|
||||
result = paInternalInfo_.hostApis_[hostApi]->privatePaFrontInfo.baseDeviceIndex + hostApiDeviceIndex;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -633,7 +649,7 @@ PaDeviceIndex Pa_GetDeviceCount( void )
|
|||
}
|
||||
else
|
||||
{
|
||||
result = deviceCount_;
|
||||
result = paInternalInfo_.deviceCount_;
|
||||
}
|
||||
|
||||
PA_LOGAPI_EXIT_PAERROR_OR_T_RESULT( "Pa_GetDeviceCount", "PaDeviceIndex: %d", result );
|
||||
|
|
@ -656,7 +672,7 @@ PaDeviceIndex Pa_GetDefaultInputDevice( void )
|
|||
}
|
||||
else
|
||||
{
|
||||
result = hostApis_[hostApi]->info.defaultInputDevice;
|
||||
result = paInternalInfo_.hostApis_[hostApi]->info.defaultInputDevice;
|
||||
}
|
||||
|
||||
PA_LOGAPI_EXIT_T( "Pa_GetDefaultInputDevice", "PaDeviceIndex: %d", result );
|
||||
|
|
@ -679,7 +695,7 @@ PaDeviceIndex Pa_GetDefaultOutputDevice( void )
|
|||
}
|
||||
else
|
||||
{
|
||||
result = hostApis_[hostApi]->info.defaultOutputDevice;
|
||||
result = paInternalInfo_.hostApis_[hostApi]->info.defaultOutputDevice;
|
||||
}
|
||||
|
||||
PA_LOGAPI_EXIT_T( "Pa_GetDefaultOutputDevice", "PaDeviceIndex: %d", result );
|
||||
|
|
@ -688,6 +704,117 @@ PaDeviceIndex Pa_GetDefaultOutputDevice( void )
|
|||
}
|
||||
|
||||
|
||||
PaError Pa_UpdateAvailableDeviceList( void )
|
||||
{
|
||||
PaError result = paNoError;
|
||||
void **scanResults = NULL;
|
||||
int *deviceCounts = NULL;
|
||||
int i = 0;
|
||||
|
||||
PA_LOGAPI_ENTER( "Pa_UpdateAvailableDeviceList" );
|
||||
if( !PA_IS_INITIALISED_ )
|
||||
{
|
||||
result = paNotInitialized;
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Allocate data structures used in 2-stage commit */
|
||||
scanResults = (void **) PaUtil_AllocateMemory( sizeof(void*) * paInternalInfo_.hostApisCount_ );
|
||||
if( !scanResults )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto done;
|
||||
}
|
||||
|
||||
deviceCounts = ( int * ) PaUtil_AllocateMemory( sizeof( int ) * paInternalInfo_.hostApisCount_ );
|
||||
if( !deviceCounts )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Phase 1: Perform a scan of new devices */
|
||||
for( i = 0 ; i < paInternalInfo_.hostApisCount_ ; ++i )
|
||||
{
|
||||
PaUtilHostApiRepresentation *hostApi = paInternalInfo_.hostApis_[i];
|
||||
if( hostApi->ScanDeviceInfos == NULL )
|
||||
continue;
|
||||
|
||||
PA_DEBUG(( "Scanning new device list for host api %d.\n",i));
|
||||
if( hostApi->ScanDeviceInfos( hostApi, i, &scanResults[ i ], &deviceCounts[ i ] ) != paNoError )
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
/* Check the result of the scan operation */
|
||||
if( i < paInternalInfo_.hostApisCount_ )
|
||||
{
|
||||
/* If failure, rollback the scan changes back to original state */
|
||||
int j = 0;
|
||||
for( j = 0 ; j < i ; ++j )
|
||||
{
|
||||
PaUtilHostApiRepresentation *hostApi = paInternalInfo_.hostApis_[j];
|
||||
if( hostApi->DisposeDeviceInfos == NULL )
|
||||
continue;
|
||||
|
||||
PA_DEBUG(( "Performing rollback for device list scan for host api %d.\n",i));
|
||||
hostApi->DisposeDeviceInfos( hostApi, scanResults[ j ], deviceCounts[ j ] );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int baseDeviceIndex = 0;
|
||||
paInternalInfo_.deviceCount_ = 0;
|
||||
|
||||
/* Otherwise, commit the scan changes to each back-end */
|
||||
for( i = 0 ; i < paInternalInfo_.hostApisCount_ ; ++i )
|
||||
{
|
||||
PaUtilHostApiRepresentation *hostApi = paInternalInfo_.hostApis_[i];
|
||||
if( hostApi->CommitDeviceInfos == NULL )
|
||||
{
|
||||
/* Not yet implemented for this backend. Just
|
||||
assume that the baseDeviceIndex and the paInternalInfo_.deviceCount_ are
|
||||
incremented according to the values in the info */
|
||||
baseDeviceIndex += hostApi->info.deviceCount;
|
||||
paInternalInfo_.deviceCount_ += hostApi->info.deviceCount;
|
||||
continue;
|
||||
}
|
||||
|
||||
PA_DEBUG(( "Committing device list scan for host api %d.\n",i));
|
||||
if( hostApi->CommitDeviceInfos( hostApi, i, scanResults[ i ], deviceCounts[ i ] ) != paNoError )
|
||||
{
|
||||
PA_DEBUG(( "Committing failed (shouldn't happen) %d.\n",i));
|
||||
result = paInternalError;
|
||||
goto done;
|
||||
}
|
||||
|
||||
assert( hostApi->info.defaultInputDevice < hostApi->info.deviceCount );
|
||||
assert( hostApi->info.defaultOutputDevice < hostApi->info.deviceCount );
|
||||
|
||||
hostApi->privatePaFrontInfo.baseDeviceIndex = baseDeviceIndex;
|
||||
|
||||
if( hostApi->info.defaultInputDevice != paNoDevice )
|
||||
hostApi->info.defaultInputDevice += baseDeviceIndex;
|
||||
|
||||
if( hostApi->info.defaultOutputDevice != paNoDevice )
|
||||
hostApi->info.defaultOutputDevice += baseDeviceIndex;
|
||||
|
||||
baseDeviceIndex += hostApi->info.deviceCount;
|
||||
paInternalInfo_.deviceCount_ += hostApi->info.deviceCount;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
|
||||
if( scanResults )
|
||||
PaUtil_FreeMemory( scanResults );
|
||||
|
||||
if( deviceCounts )
|
||||
PaUtil_FreeMemory( deviceCounts );
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device )
|
||||
{
|
||||
int hostSpecificDeviceIndex;
|
||||
|
|
@ -708,7 +835,7 @@ const PaDeviceInfo* Pa_GetDeviceInfo( PaDeviceIndex device )
|
|||
}
|
||||
else
|
||||
{
|
||||
result = hostApis_[hostApiIndex]->deviceInfos[ hostSpecificDeviceIndex ];
|
||||
result = paInternalInfo_.hostApis_[hostApiIndex]->deviceInfos[ hostSpecificDeviceIndex ];
|
||||
|
||||
PA_LOGAPI(("Pa_GetDeviceInfo returned:\n" ));
|
||||
PA_LOGAPI(("\tPaDeviceInfo*: 0x%p:\n", result ));
|
||||
|
|
@ -850,7 +977,7 @@ static PaError ValidateOpenStreamParameters(
|
|||
if( inputHostApiIndex != -1 )
|
||||
{
|
||||
*hostApiInputDevice = paUseHostApiSpecificDeviceSpecification;
|
||||
*hostApi = hostApis_[inputHostApiIndex];
|
||||
*hostApi = paInternalInfo_.hostApis_[inputHostApiIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -864,14 +991,14 @@ static PaError ValidateOpenStreamParameters(
|
|||
}
|
||||
else
|
||||
{
|
||||
if( inputParameters->device < 0 || inputParameters->device >= deviceCount_ )
|
||||
if( inputParameters->device < 0 || inputParameters->device >= paInternalInfo_.deviceCount_ )
|
||||
return paInvalidDevice;
|
||||
|
||||
inputHostApiIndex = FindHostApi( inputParameters->device, hostApiInputDevice );
|
||||
if( inputHostApiIndex < 0 )
|
||||
return paInternalError;
|
||||
|
||||
*hostApi = hostApis_[inputHostApiIndex];
|
||||
*hostApi = paInternalInfo_.hostApis_[inputHostApiIndex];
|
||||
|
||||
if( inputParameters->channelCount <= 0 )
|
||||
return paInvalidChannelCount;
|
||||
|
|
@ -901,7 +1028,7 @@ static PaError ValidateOpenStreamParameters(
|
|||
if( outputHostApiIndex != -1 )
|
||||
{
|
||||
*hostApiOutputDevice = paUseHostApiSpecificDeviceSpecification;
|
||||
*hostApi = hostApis_[outputHostApiIndex];
|
||||
*hostApi = paInternalInfo_.hostApis_[outputHostApiIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -915,14 +1042,14 @@ static PaError ValidateOpenStreamParameters(
|
|||
}
|
||||
else
|
||||
{
|
||||
if( outputParameters->device < 0 || outputParameters->device >= deviceCount_ )
|
||||
if( outputParameters->device < 0 || outputParameters->device >= paInternalInfo_.deviceCount_ )
|
||||
return paInvalidDevice;
|
||||
|
||||
outputHostApiIndex = FindHostApi( outputParameters->device, hostApiOutputDevice );
|
||||
if( outputHostApiIndex < 0 )
|
||||
return paInternalError;
|
||||
|
||||
*hostApi = hostApis_[outputHostApiIndex];
|
||||
*hostApi = paInternalInfo_.hostApis_[outputHostApiIndex];
|
||||
|
||||
if( outputParameters->channelCount <= 0 )
|
||||
return paInvalidChannelCount;
|
||||
|
|
@ -1751,3 +1878,29 @@ PaError Pa_GetSampleSize( PaSampleFormat format )
|
|||
return (PaError) result;
|
||||
}
|
||||
|
||||
extern void PaUtil_LockHotPlug();
|
||||
extern void PaUtil_UnlockHotPlug();
|
||||
|
||||
|
||||
PaError Pa_SetDevicesChangedCallback( void *userData, PaStreamFinishedCallback* devicesChangedCallback )
|
||||
{
|
||||
PaUtil_LockHotPlug();
|
||||
paInternalInfo_.devicesChangedCallback_ = devicesChangedCallback;
|
||||
paInternalInfo_.devicesChangedCallbackUserData_ = userData;
|
||||
PaUtil_UnlockHotPlug();
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
/* Called whenever a OS audio device change has been detected */
|
||||
void PaUtil_DevicesChanged(unsigned state, void* pData)
|
||||
{
|
||||
(void)state;
|
||||
(void)pData;
|
||||
PaUtil_LockHotPlug();
|
||||
if (paInternalInfo_.devicesChangedCallback_)
|
||||
{
|
||||
(paInternalInfo_.devicesChangedCallback_)(paInternalInfo_.devicesChangedCallbackUserData_);
|
||||
}
|
||||
PaUtil_UnlockHotPlug();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef PA_HOSTAPI_H
|
||||
#define PA_HOSTAPI_H
|
||||
/*
|
||||
* $Id$
|
||||
* $Id: pa_hostapi.h 1664 2011-05-01 16:10:58Z rossb $
|
||||
* Portable Audio I/O Library
|
||||
* host api representation
|
||||
*
|
||||
|
|
@ -275,6 +275,37 @@ typedef struct PaUtilHostApiRepresentation {
|
|||
const PaStreamParameters *inputParameters,
|
||||
const PaStreamParameters *outputParameters,
|
||||
double sampleRate );
|
||||
|
||||
/**
|
||||
Collect current native device information and compute a new device count.
|
||||
This method should not result in the host API making any changes to its
|
||||
internal data structures, instead it is the first step in a two-stage commit
|
||||
process which will be completed only if all host API scans return with no errors.
|
||||
|
||||
Some time later the caller will either (1) pass scanResults and newDeviceCount
|
||||
to CommitDeviceInfos() to complete the transaction, or (2) pass scanResults
|
||||
and newDeviceCount to DisposeDeviceInfos() to abort the transaction.
|
||||
*/
|
||||
PaError (*ScanDeviceInfos)( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex index, void **scanResults, int *newDeviceCount );
|
||||
|
||||
/**
|
||||
Replace the previous device information with the device information
|
||||
passed in as an argument via scanResults. This is the second/final stage of
|
||||
the two-stage transaction required for updating the available device information.
|
||||
This function should free any resources associated with the previous device
|
||||
information.
|
||||
@FIXME: this function should probably not return an error code as it should not be
|
||||
permitted to fail.
|
||||
*/
|
||||
PaError (*CommitDeviceInfos)( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex index, void *scanResults, int deviceCount );
|
||||
|
||||
/**
|
||||
Free device information previously returned by ScanDeviceInfos(). This function
|
||||
will be called in cases where the update available device info transaction
|
||||
failed for some reason.
|
||||
*/
|
||||
PaError (*DisposeDeviceInfos)( struct PaUtilHostApiRepresentation *hostApi, void *scanResults, int deviceCount );
|
||||
|
||||
} PaUtilHostApiRepresentation;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_process.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
* Portable Audio I/O Library
|
||||
* streamCallback <-> host buffer processing adapter
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_linux_alsa.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
* PortAudio Portable Real-Time Audio Library
|
||||
* Latest Version at: http://www.portaudio.com
|
||||
* ALSA implementation by Joshua Haberman and Arve Knudsen
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_win_ds.c 1672 2011-05-04 20:11:30Z rossb $
|
||||
* Portable Audio I/O Library DirectSound implementation
|
||||
*
|
||||
* Authors: Phil Burk, Robert Marsanyi & Ross Bencina
|
||||
|
|
@ -75,10 +75,6 @@
|
|||
#include "pa_win_waveformat.h"
|
||||
#include "pa_win_wdmks_utils.h"
|
||||
|
||||
#ifndef PA_USE_WMME
|
||||
#error "Portaudio internal error: PA_USE_WMME=0/1 not defined. pa_hostapi.h should ensure that it is."
|
||||
#endif
|
||||
|
||||
#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
|
||||
#pragma comment( lib, "dsound.lib" )
|
||||
#pragma comment( lib, "winmm.lib" )
|
||||
|
|
@ -141,6 +137,9 @@ static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
|
|||
const PaStreamParameters *inputParameters,
|
||||
const PaStreamParameters *outputParameters,
|
||||
double sampleRate );
|
||||
static PaError ScanDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex index, void **newDeviceInfos, int *newDeviceCount );
|
||||
static PaError CommitDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex index, void *deviceInfos, int deviceCount );
|
||||
static PaError DisposeDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, void *deviceInfos, int deviceCount );
|
||||
static PaError CloseStream( PaStream* stream );
|
||||
static PaError StartStream( PaStream *stream );
|
||||
static PaError StopStream( PaStream *stream );
|
||||
|
|
@ -249,6 +248,12 @@ typedef struct PaWinDsStream
|
|||
volatile int abortProcessing; /* stop thread immediately */
|
||||
} PaWinDsStream;
|
||||
|
||||
typedef struct PaWinDsScanDeviceInfosResults{ /* used for tranferring device infos during scanning / rescanning */
|
||||
PaDeviceInfo **deviceInfos;
|
||||
PaDeviceIndex defaultInputDevice;
|
||||
PaDeviceIndex defaultOutputDevice;
|
||||
} PaWinDsScanDeviceInfosResults;
|
||||
|
||||
|
||||
/************************************************************************************
|
||||
** Duplicate the input string using the allocations allocator.
|
||||
|
|
@ -293,7 +298,7 @@ typedef struct DSDeviceNameAndGUIDVector{
|
|||
|
||||
int count;
|
||||
int free;
|
||||
DSDeviceNameAndGUID *items; // Allocated using LocalAlloc()
|
||||
DSDeviceNameAndGUID *items; /* Allocated using LocalAlloc() */
|
||||
} DSDeviceNameAndGUIDVector;
|
||||
|
||||
typedef struct DSDeviceNamesAndGUIDs{
|
||||
|
|
@ -590,28 +595,15 @@ static double defaultSampleRateSearchOrder_[] =
|
|||
** The device will not be added to the device list if any errors are encountered.
|
||||
*/
|
||||
static PaError AddOutputDeviceInfoFromDirectSound(
|
||||
PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo, char *name, LPGUID lpGUID, char *pnpInterface )
|
||||
{
|
||||
PaUtilHostApiRepresentation *hostApi = &winDsHostApi->inheritedHostApiRep;
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
|
||||
PaDeviceInfo *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
|
||||
HRESULT hr;
|
||||
LPDIRECTSOUND lpDirectSound;
|
||||
LPDIRECTSOUND lpDirectSound = NULL;
|
||||
DSCAPS caps;
|
||||
int deviceOK = TRUE;
|
||||
PaError result = paNoError;
|
||||
int i;
|
||||
|
||||
/* Copy GUID to the device info structure. Set pointer. */
|
||||
if( lpGUID == NULL )
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
|
||||
winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
|
||||
}
|
||||
|
||||
if( lpGUID )
|
||||
{
|
||||
|
|
@ -619,7 +611,7 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
IsEqualGUID (&IID_IRolandVSCEmulated2,lpGUID) )
|
||||
{
|
||||
PA_DEBUG(("BLACKLISTED: %s \n",name));
|
||||
return paNoError;
|
||||
return paInvalidDevice;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -627,23 +619,6 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
Note that using CoCreateInstance doesn't work on windows CE.
|
||||
*/
|
||||
hr = paWinDsDSoundEntryPoints.DirectSoundCreate( lpGUID, &lpDirectSound, NULL );
|
||||
|
||||
/** try using CoCreateInstance because DirectSoundCreate was hanging under
|
||||
some circumstances - note this was probably related to the
|
||||
#define BOOL short bug which has now been fixed
|
||||
@todo delete this comment and the following code once we've ensured
|
||||
there is no bug.
|
||||
*/
|
||||
/*
|
||||
hr = CoCreateInstance( &CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER,
|
||||
&IID_IDirectSound, (void**)&lpDirectSound );
|
||||
|
||||
if( hr == S_OK )
|
||||
{
|
||||
hr = IDirectSound_Initialize( lpDirectSound, lpGUID );
|
||||
}
|
||||
*/
|
||||
|
||||
if( hr != DS_OK )
|
||||
{
|
||||
if (hr == DSERR_ALLOCATED)
|
||||
|
|
@ -664,7 +639,8 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
lpGUID->Data4[6],
|
||||
lpGUID->Data4[7]));
|
||||
|
||||
deviceOK = FALSE;
|
||||
result = paUnanticipatedHostError;
|
||||
goto error;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -675,7 +651,9 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
if( hr != DS_OK )
|
||||
{
|
||||
DBUG(("Cannot GetCaps() for DirectSound device %s. Result = 0x%x\n", name, hr ));
|
||||
deviceOK = FALSE;
|
||||
|
||||
result = paUnanticipatedHostError;
|
||||
goto error;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -684,12 +662,11 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
if( caps.dwFlags & DSCAPS_EMULDRIVER )
|
||||
{
|
||||
/* If WMME supported, then reject Emulated drivers because they are lousy. */
|
||||
deviceOK = FALSE;
|
||||
result = paInvalidDevice;
|
||||
goto error;
|
||||
}
|
||||
#endif
|
||||
|
||||
if( deviceOK )
|
||||
{
|
||||
deviceInfo->maxInputChannels = 0;
|
||||
winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
|
||||
|
||||
|
|
@ -817,20 +794,28 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
//printf( "min %d max %d\n", caps.dwMinSecondarySampleRate, caps.dwMaxSecondarySampleRate );
|
||||
// dwFlags | DSCAPS_CONTINUOUSRATE
|
||||
}
|
||||
}
|
||||
|
||||
IDirectSound_Release( lpDirectSound );
|
||||
}
|
||||
|
||||
if( deviceOK )
|
||||
/* Copy GUID to the device info structure. Set pointer. */
|
||||
if( lpGUID == NULL )
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
|
||||
winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
|
||||
}
|
||||
|
||||
deviceInfo->name = name;
|
||||
|
||||
if( lpGUID == NULL )
|
||||
hostApi->info.defaultOutputDevice = hostApi->info.deviceCount;
|
||||
return result;
|
||||
|
||||
hostApi->info.deviceCount++;
|
||||
}
|
||||
error:
|
||||
if( lpDirectSound )
|
||||
IDirectSound_Release( lpDirectSound );
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -844,44 +829,20 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
** The device will not be added to the device list if any errors are encountered.
|
||||
*/
|
||||
static PaError AddInputDeviceInfoFromDirectSoundCapture(
|
||||
PaWinDsHostApiRepresentation *winDsHostApi, char *name, LPGUID lpGUID, char *pnpInterface )
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo, char *name, LPGUID lpGUID, char *pnpInterface )
|
||||
{
|
||||
PaUtilHostApiRepresentation *hostApi = &winDsHostApi->inheritedHostApiRep;
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo = (PaWinDsDeviceInfo*) hostApi->deviceInfos[hostApi->info.deviceCount];
|
||||
PaDeviceInfo *deviceInfo = &winDsDeviceInfo->inheritedDeviceInfo;
|
||||
HRESULT hr;
|
||||
LPDIRECTSOUNDCAPTURE lpDirectSoundCapture;
|
||||
LPDIRECTSOUNDCAPTURE lpDirectSoundCapture = NULL;
|
||||
DSCCAPS caps;
|
||||
int deviceOK = TRUE;
|
||||
PaError result = paNoError;
|
||||
|
||||
/* Copy GUID to the device info structure. Set pointer. */
|
||||
if( lpGUID == NULL )
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
|
||||
memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
|
||||
}
|
||||
|
||||
hr = paWinDsDSoundEntryPoints.DirectSoundCaptureCreate( lpGUID, &lpDirectSoundCapture, NULL );
|
||||
|
||||
/** try using CoCreateInstance because DirectSoundCreate was hanging under
|
||||
some circumstances - note this was probably related to the
|
||||
#define BOOL short bug which has now been fixed
|
||||
@todo delete this comment and the following code once we've ensured
|
||||
there is no bug.
|
||||
*/
|
||||
/*
|
||||
hr = CoCreateInstance( &CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER,
|
||||
&IID_IDirectSoundCapture, (void**)&lpDirectSoundCapture );
|
||||
*/
|
||||
if( hr != DS_OK )
|
||||
{
|
||||
DBUG(("Cannot create Capture for %s. Result = 0x%x\n", name, hr ));
|
||||
deviceOK = FALSE;
|
||||
result = paUnanticipatedHostError;
|
||||
goto error;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -892,7 +853,8 @@ static PaError AddInputDeviceInfoFromDirectSoundCapture(
|
|||
if( hr != DS_OK )
|
||||
{
|
||||
DBUG(("Cannot GetCaps() for Capture device %s. Result = 0x%x\n", name, hr ));
|
||||
deviceOK = FALSE;
|
||||
result = paUnanticipatedHostError;
|
||||
goto error;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -900,12 +862,11 @@ static PaError AddInputDeviceInfoFromDirectSoundCapture(
|
|||
if( caps.dwFlags & DSCAPS_EMULDRIVER )
|
||||
{
|
||||
/* If WMME supported, then reject Emulated drivers because they are lousy. */
|
||||
deviceOK = FALSE;
|
||||
result = paInvalidDevice;
|
||||
goto error;
|
||||
}
|
||||
#endif
|
||||
|
||||
if( deviceOK )
|
||||
{
|
||||
deviceInfo->maxInputChannels = caps.dwChannels;
|
||||
winDsDeviceInfo->deviceInputChannelCountIsKnown = 1;
|
||||
|
||||
|
|
@ -989,20 +950,29 @@ static PaError AddInputDeviceInfoFromDirectSoundCapture(
|
|||
}
|
||||
else deviceInfo->defaultSampleRate = 0.;
|
||||
}
|
||||
}
|
||||
|
||||
IDirectSoundCapture_Release( lpDirectSoundCapture );
|
||||
}
|
||||
|
||||
if( deviceOK )
|
||||
|
||||
/* Copy GUID to the device info structure. Set pointer. */
|
||||
if( lpGUID == NULL )
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
winDsDeviceInfo->lpGUID = &winDsDeviceInfo->guid;
|
||||
memcpy( &winDsDeviceInfo->guid, lpGUID, sizeof(GUID) );
|
||||
}
|
||||
|
||||
deviceInfo->name = name;
|
||||
|
||||
if( lpGUID == NULL )
|
||||
hostApi->info.defaultInputDevice = hostApi->info.deviceCount;
|
||||
return result;
|
||||
|
||||
hostApi->info.deviceCount++;
|
||||
}
|
||||
error:
|
||||
if( lpDirectSoundCapture )
|
||||
IDirectSoundCapture_Release( lpDirectSoundCapture );
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
@ -1012,12 +982,10 @@ static PaError AddInputDeviceInfoFromDirectSoundCapture(
|
|||
PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
|
||||
{
|
||||
PaError result = paNoError;
|
||||
int i, deviceCount;
|
||||
int deviceCount;
|
||||
PaWinDsHostApiRepresentation *winDsHostApi;
|
||||
DSDeviceNamesAndGUIDs deviceNamesAndGUIDs;
|
||||
|
||||
PaWinDsDeviceInfo *deviceInfoArray;
|
||||
char comWasInitialized = 0;
|
||||
void *scanResults = 0;
|
||||
|
||||
/*
|
||||
If COM is already initialized CoInitialize will either return
|
||||
|
|
@ -1034,11 +1002,6 @@ PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInde
|
|||
if( hr != RPC_E_CHANGED_MODE )
|
||||
comWasInitialized = 1;
|
||||
|
||||
/* initialise guid vectors so they can be safely deleted on error */
|
||||
deviceNamesAndGUIDs.winDsHostApi = NULL;
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items = NULL;
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items = NULL;
|
||||
|
||||
PaWinDs_InitializeDSoundEntryPoints();
|
||||
|
||||
winDsHostApi = (PaWinDsHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWinDsHostApiRepresentation) );
|
||||
|
|
@ -1062,109 +1025,25 @@ PaError PaWinDs_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInde
|
|||
(*hostApi)->info.type = paDirectSound;
|
||||
(*hostApi)->info.name = "Windows DirectSound";
|
||||
|
||||
/* these are all updated by CommitDeviceInfos() */
|
||||
(*hostApi)->info.deviceCount = 0;
|
||||
(*hostApi)->info.defaultInputDevice = paNoDevice;
|
||||
(*hostApi)->info.defaultOutputDevice = paNoDevice;
|
||||
(*hostApi)->deviceInfos = 0;
|
||||
|
||||
|
||||
/* DSound - enumerate devices to count them and to gather their GUIDs */
|
||||
|
||||
result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs, winDsHostApi->allocations );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs, winDsHostApi->allocations );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
|
||||
paWinDsDSoundEntryPoints.DirectSoundEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
|
||||
if( deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError != paNoError )
|
||||
{
|
||||
result = deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError;
|
||||
goto error;
|
||||
}
|
||||
|
||||
if( deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError != paNoError )
|
||||
{
|
||||
result = deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError;
|
||||
goto error;
|
||||
}
|
||||
|
||||
deviceCount = deviceNamesAndGUIDs.inputNamesAndGUIDs.count + deviceNamesAndGUIDs.outputNamesAndGUIDs.count;
|
||||
|
||||
#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
|
||||
if( deviceCount > 0 )
|
||||
{
|
||||
deviceNamesAndGUIDs.winDsHostApi = winDsHostApi;
|
||||
FindDevicePnpInterfaces( &deviceNamesAndGUIDs );
|
||||
}
|
||||
#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
|
||||
|
||||
if( deviceCount > 0 )
|
||||
{
|
||||
/* allocate array for pointers to PaDeviceInfo structs */
|
||||
(*hostApi)->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
|
||||
winDsHostApi->allocations, sizeof(PaDeviceInfo*) * deviceCount );
|
||||
if( !(*hostApi)->deviceInfos )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* allocate all PaDeviceInfo structs in a contiguous block */
|
||||
deviceInfoArray = (PaWinDsDeviceInfo*)PaUtil_GroupAllocateMemory(
|
||||
winDsHostApi->allocations, sizeof(PaWinDsDeviceInfo) * deviceCount );
|
||||
if( !deviceInfoArray )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
for( i=0; i < deviceCount; ++i )
|
||||
{
|
||||
PaDeviceInfo *deviceInfo = &deviceInfoArray[i].inheritedDeviceInfo;
|
||||
deviceInfo->structVersion = 2;
|
||||
deviceInfo->hostApi = hostApiIndex;
|
||||
deviceInfo->name = 0;
|
||||
(*hostApi)->deviceInfos[i] = deviceInfo;
|
||||
}
|
||||
|
||||
for( i=0; i < deviceNamesAndGUIDs.inputNamesAndGUIDs.count; ++i )
|
||||
{
|
||||
result = AddInputDeviceInfoFromDirectSoundCapture( winDsHostApi,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].name,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].lpGUID,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].pnpInterface );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
}
|
||||
|
||||
for( i=0; i < deviceNamesAndGUIDs.outputNamesAndGUIDs.count; ++i )
|
||||
{
|
||||
result = AddOutputDeviceInfoFromDirectSound( winDsHostApi,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].name,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].lpGUID,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].pnpInterface );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
result = ScanDeviceInfos( &winDsHostApi->inheritedHostApiRep, hostApiIndex, &scanResults, &deviceCount );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
/* FIXME for now we ignore the result of CommitDeviceInfos(), it should probably be an atomic non-failing operation */
|
||||
CommitDeviceInfos( &winDsHostApi->inheritedHostApiRep, hostApiIndex, scanResults, deviceCount );
|
||||
|
||||
(*hostApi)->Terminate = Terminate;
|
||||
(*hostApi)->OpenStream = OpenStream;
|
||||
(*hostApi)->IsFormatSupported = IsFormatSupported;
|
||||
(*hostApi)->ScanDeviceInfos = ScanDeviceInfos;
|
||||
(*hostApi)->CommitDeviceInfos = CommitDeviceInfos;
|
||||
(*hostApi)->DisposeDeviceInfos = DisposeDeviceInfos;
|
||||
|
||||
PaUtil_InitializeStreamInterface( &winDsHostApi->callbackStreamInterface, CloseStream, StartStream,
|
||||
StopStream, AbortStream, IsStreamStopped, IsStreamActive,
|
||||
|
|
@ -1191,9 +1070,6 @@ error:
|
|||
PaUtil_FreeMemory( winDsHostApi );
|
||||
}
|
||||
|
||||
TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
|
||||
if( comWasInitialized )
|
||||
CoUninitialize();
|
||||
|
||||
|
|
@ -1369,6 +1245,231 @@ static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
|
|||
return paFormatIsSupported;
|
||||
}
|
||||
|
||||
/***********************************************************************************/
|
||||
static PaError ScanDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex hostApiIndex, void **scanResults, int *newDeviceCount )
|
||||
{
|
||||
PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
|
||||
PaWinDsDeviceInfo *deviceInfoArray;
|
||||
char comWasInitialized = winDsHostApi->comWasInitialized;
|
||||
PaError result = paNoError;
|
||||
PaWinDsScanDeviceInfosResults *outArgument = 0;
|
||||
DSDeviceNamesAndGUIDs deviceNamesAndGUIDs;
|
||||
int i = 0;
|
||||
int maximumNewDeviceCount = 0;
|
||||
|
||||
/* Check preconditions */
|
||||
if( !comWasInitialized || scanResults == NULL || newDeviceCount == NULL )
|
||||
return paInternalError;
|
||||
|
||||
/* initialize the out params */
|
||||
*scanResults = NULL;
|
||||
*newDeviceCount = 0;
|
||||
|
||||
/* initialise guid vectors so they can be safely deleted on error */
|
||||
deviceNamesAndGUIDs.winDsHostApi = NULL;
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items = NULL;
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items = NULL;
|
||||
|
||||
result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs, winDsHostApi->allocations );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
result = InitializeDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs, winDsHostApi->allocations );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
deviceNamesAndGUIDs.winDsHostApi = winDsHostApi;
|
||||
|
||||
/* DSound - enumerate devices to count them and to gather their GUIDs and device names */
|
||||
|
||||
paWinDsDSoundEntryPoints.DirectSoundCaptureEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
|
||||
if( deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError != paNoError )
|
||||
{
|
||||
result = deviceNamesAndGUIDs.inputNamesAndGUIDs.enumerationError;
|
||||
goto error;
|
||||
}
|
||||
|
||||
paWinDsDSoundEntryPoints.DirectSoundEnumerateA( (LPDSENUMCALLBACK)CollectGUIDsProc, (void *)&deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
|
||||
if( deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError != paNoError )
|
||||
{
|
||||
result = deviceNamesAndGUIDs.outputNamesAndGUIDs.enumerationError;
|
||||
goto error;
|
||||
}
|
||||
|
||||
maximumNewDeviceCount = deviceNamesAndGUIDs.inputNamesAndGUIDs.count +
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.count;
|
||||
|
||||
#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
|
||||
if( maximumNewDeviceCount > 0 )
|
||||
{
|
||||
FindDevicePnpInterfaces( &deviceNamesAndGUIDs );
|
||||
}
|
||||
#endif /* PAWIN_USE_WDMKS_DEVICE_INFO */
|
||||
|
||||
if( maximumNewDeviceCount > 0 )
|
||||
{
|
||||
/* Allocate the out param for all the info we need */
|
||||
outArgument = (PaWinDsScanDeviceInfosResults *) PaUtil_GroupAllocateMemory(
|
||||
winDsHostApi->allocations, sizeof(PaWinDsScanDeviceInfosResults) );
|
||||
if( !outArgument )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* allocate array for pointers to PaDeviceInfo structs */
|
||||
outArgument->deviceInfos = (PaDeviceInfo**)PaUtil_GroupAllocateMemory(
|
||||
winDsHostApi->allocations, sizeof(PaDeviceInfo*) * maximumNewDeviceCount );
|
||||
if( !outArgument->deviceInfos )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* allocate all PaDeviceInfo structs in a contiguous block */
|
||||
deviceInfoArray = (PaWinDsDeviceInfo*)PaUtil_GroupAllocateMemory(
|
||||
winDsHostApi->allocations, sizeof(PaWinDsDeviceInfo) * maximumNewDeviceCount );
|
||||
if( !deviceInfoArray )
|
||||
{
|
||||
result = paInsufficientMemory;
|
||||
goto error;
|
||||
}
|
||||
|
||||
for( i = 0 ; i < maximumNewDeviceCount; ++i )
|
||||
{
|
||||
PaDeviceInfo *deviceInfo = &deviceInfoArray[i].inheritedDeviceInfo;
|
||||
deviceInfo->structVersion = 2;
|
||||
deviceInfo->hostApi = hostApiIndex;
|
||||
deviceInfo->name = 0;
|
||||
|
||||
outArgument->deviceInfos[ i ] = deviceInfo;
|
||||
}
|
||||
|
||||
for( i = 0 ; i < deviceNamesAndGUIDs.inputNamesAndGUIDs.count ; ++i )
|
||||
{
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo = (PaWinDsDeviceInfo*)outArgument->deviceInfos[*newDeviceCount];
|
||||
|
||||
result = AddInputDeviceInfoFromDirectSoundCapture( winDsDeviceInfo,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].name,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].lpGUID,
|
||||
deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].pnpInterface );
|
||||
if( result == paNoError )
|
||||
{
|
||||
if( deviceNamesAndGUIDs.inputNamesAndGUIDs.items[i].lpGUID == NULL )
|
||||
outArgument->defaultInputDevice = *newDeviceCount;
|
||||
(*newDeviceCount)++;
|
||||
}
|
||||
/* ignore error results here and just skip the device */
|
||||
}
|
||||
|
||||
for( i = 0 ; i < deviceNamesAndGUIDs.outputNamesAndGUIDs.count ; ++i )
|
||||
{
|
||||
PaWinDsDeviceInfo *winDsDeviceInfo = (PaWinDsDeviceInfo*)outArgument->deviceInfos[*newDeviceCount];
|
||||
|
||||
result = AddOutputDeviceInfoFromDirectSound( winDsDeviceInfo,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].name,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].lpGUID,
|
||||
deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].pnpInterface );
|
||||
if( result == paNoError )
|
||||
{
|
||||
if( deviceNamesAndGUIDs.outputNamesAndGUIDs.items[i].lpGUID == NULL )
|
||||
outArgument->defaultOutputDevice = *newDeviceCount;
|
||||
(*newDeviceCount)++;
|
||||
}
|
||||
/* ignore error results here and just skip the device */
|
||||
}
|
||||
}
|
||||
|
||||
result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
result = TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
if( result != paNoError )
|
||||
goto error;
|
||||
|
||||
*scanResults = outArgument;
|
||||
return result;
|
||||
|
||||
error:
|
||||
TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.inputNamesAndGUIDs );
|
||||
TerminateDSDeviceNameAndGUIDVector( &deviceNamesAndGUIDs.outputNamesAndGUIDs );
|
||||
|
||||
if( outArgument )
|
||||
{
|
||||
if( outArgument->deviceInfos )
|
||||
{
|
||||
if( outArgument->deviceInfos[0] )
|
||||
{
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, outArgument->deviceInfos[0] );
|
||||
}
|
||||
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, outArgument->deviceInfos );
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static PaError CommitDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, PaHostApiIndex index, void *scanResults, int deviceCount )
|
||||
{
|
||||
PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
|
||||
PaError result = paNoError;
|
||||
int i = 0;
|
||||
|
||||
hostApi->info.deviceCount = 0;
|
||||
hostApi->info.defaultInputDevice = paNoDevice;
|
||||
hostApi->info.defaultOutputDevice = paNoDevice;
|
||||
|
||||
/* Free any old memory which might be in the device info */
|
||||
if( hostApi->deviceInfos )
|
||||
{
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, hostApi->deviceInfos[0] );
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, hostApi->deviceInfos );
|
||||
hostApi->deviceInfos = NULL;
|
||||
}
|
||||
|
||||
if( scanResults != NULL )
|
||||
{
|
||||
PaWinDsScanDeviceInfosResults *scanDeviceInfosResults = ( PaWinDsScanDeviceInfosResults * ) scanResults;
|
||||
|
||||
if( deviceCount > 0 )
|
||||
{
|
||||
/* use the array allocated in ScanDeviceInfos() as our deviceInfos */
|
||||
hostApi->deviceInfos = scanDeviceInfosResults->deviceInfos;
|
||||
|
||||
hostApi->info.defaultInputDevice = scanDeviceInfosResults->defaultInputDevice;
|
||||
hostApi->info.defaultOutputDevice = scanDeviceInfosResults->defaultOutputDevice;
|
||||
|
||||
hostApi->info.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, scanDeviceInfosResults );
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static PaError DisposeDeviceInfos( struct PaUtilHostApiRepresentation *hostApi, void *scanResults, int deviceCount )
|
||||
{
|
||||
PaWinDsHostApiRepresentation *winDsHostApi = (PaWinDsHostApiRepresentation*)hostApi;
|
||||
|
||||
if( scanResults != NULL )
|
||||
{
|
||||
PaWinDsScanDeviceInfosResults *scanDeviceInfosResults = ( PaWinDsScanDeviceInfosResults * ) scanResults;
|
||||
|
||||
if( scanDeviceInfosResults->deviceInfos )
|
||||
{
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, scanDeviceInfosResults->deviceInfos[0] ); /* all device info structs are allocated in a block so we can destroy them here */
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, scanDeviceInfosResults->deviceInfos );
|
||||
}
|
||||
|
||||
PaUtil_GroupFreeMemory( winDsHostApi->allocations, scanDeviceInfosResults );
|
||||
}
|
||||
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
/*************************************************************************
|
||||
** Determine minimum number of buffers required for this host based
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* $Id$
|
||||
* $Id: pa_win_wmme.c 1663 2011-05-01 13:21:43Z rossb $
|
||||
* pa_win_wmme.c
|
||||
* Implementation of PortAudio for Windows MultiMedia Extensions (WMME)
|
||||
*
|
||||
|
|
@ -1087,6 +1087,9 @@ PaError PaWinMme_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
|
|||
(*hostApi)->Terminate = Terminate;
|
||||
(*hostApi)->OpenStream = OpenStream;
|
||||
(*hostApi)->IsFormatSupported = IsFormatSupported;
|
||||
(*hostApi)->ScanDeviceInfos = 0;
|
||||
(*hostApi)->CommitDeviceInfos = 0;
|
||||
(*hostApi)->DisposeDeviceInfos = 0;
|
||||
|
||||
PaUtil_InitializeStreamInterface( &winMmeHostApi->callbackStreamInterface, CloseStream, StartStream,
|
||||
StopStream, AbortStream, IsStreamStopped, IsStreamActive,
|
||||
|
|
|
|||
315
src/os/win/pa_win_hotplug.c
Normal file
315
src/os/win/pa_win_hotplug.c
Normal file
|
|
@ -0,0 +1,315 @@
|
|||
|
||||
#include "pa_util.h"
|
||||
#include "pa_debugprint.h"
|
||||
#include "pa_allocation.h"
|
||||
|
||||
#include "pa_win_wdmks_utils.h"
|
||||
|
||||
#include <windows.h>
|
||||
#include <dbt.h>
|
||||
#include <process.h>
|
||||
#include <assert.h>
|
||||
#include <ks.h>
|
||||
#include <ksmedia.h>
|
||||
|
||||
#include <setupapi.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */
|
||||
#pragma comment( lib, "setupapi.lib" )
|
||||
#endif
|
||||
|
||||
|
||||
/* Implemented in pa_front.c
|
||||
@param first 0 = unknown, 1 = insertion, 2 = removal
|
||||
@param second Host specific device change info (in windows it is the (unicode) device path)
|
||||
*/
|
||||
extern void PaUtil_DevicesChanged(unsigned, void*);
|
||||
|
||||
/* use CreateThread for CYGWIN/Windows Mobile, _beginthreadex for all others */
|
||||
#if !defined(__CYGWIN__) && !defined(_WIN32_WCE)
|
||||
#define CREATE_THREAD_FUNCTION (HANDLE)_beginthreadex
|
||||
#define PA_THREAD_FUNC static unsigned WINAPI
|
||||
#else
|
||||
#define CREATE_THREAD_FUNCTION CreateThread
|
||||
#define PA_THREAD_FUNC static DWORD WINAPI
|
||||
#endif
|
||||
|
||||
typedef struct PaHotPlugDeviceInfo
|
||||
{
|
||||
wchar_t name[MAX_PATH];
|
||||
struct PaHotPlugDeviceInfo* next;
|
||||
} PaHotPlugDeviceInfo;
|
||||
|
||||
typedef struct PaHotPlugDeviceEventHandlerInfo
|
||||
{
|
||||
HANDLE hWnd;
|
||||
HANDLE hMsgThread;
|
||||
HANDLE hNotify;
|
||||
CRITICAL_SECTION lock;
|
||||
PaUtilAllocationGroup* cacheAllocGroup;
|
||||
PaHotPlugDeviceInfo* cache;
|
||||
|
||||
} PaHotPlugDeviceEventHandlerInfo;
|
||||
|
||||
|
||||
static BOOL RemoveDeviceFromCache(PaHotPlugDeviceEventHandlerInfo* pInfo, const wchar_t* name)
|
||||
{
|
||||
if (pInfo->cache != NULL)
|
||||
{
|
||||
PaHotPlugDeviceInfo* lastEntry = 0;
|
||||
PaHotPlugDeviceInfo* entry = pInfo->cache;
|
||||
while (entry != NULL)
|
||||
{
|
||||
if (_wcsicmp(entry->name, name) == 0)
|
||||
{
|
||||
if (lastEntry)
|
||||
{
|
||||
lastEntry->next = entry->next;
|
||||
}
|
||||
else
|
||||
{
|
||||
pInfo->cache = NULL;
|
||||
}
|
||||
PaUtil_GroupFreeMemory(pInfo->cacheAllocGroup, entry);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
lastEntry = entry;
|
||||
entry = entry->next;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void InsertDeviceIntoCache(PaHotPlugDeviceEventHandlerInfo* pInfo, const wchar_t* name)
|
||||
{
|
||||
PaHotPlugDeviceInfo** ppEntry = NULL;
|
||||
|
||||
/* Remove it first (if possible) so we don't accidentally get duplicates */
|
||||
RemoveDeviceFromCache(pInfo, name);
|
||||
|
||||
if (pInfo->cache == NULL)
|
||||
{
|
||||
ppEntry = &pInfo->cache;
|
||||
}
|
||||
else
|
||||
{
|
||||
PaHotPlugDeviceInfo* entry = pInfo->cache;
|
||||
while (entry->next != NULL)
|
||||
{
|
||||
entry = entry->next;
|
||||
}
|
||||
ppEntry = &entry->next;
|
||||
}
|
||||
|
||||
*ppEntry = (PaHotPlugDeviceInfo*)PaUtil_GroupAllocateMemory(pInfo->cacheAllocGroup, sizeof(PaHotPlugDeviceInfo));
|
||||
wcsncpy((*ppEntry)->name, name, MAX_PATH-1);
|
||||
(*ppEntry)->next = NULL;
|
||||
}
|
||||
|
||||
static BOOL IsDeviceAudio(const wchar_t* deviceName)
|
||||
{
|
||||
int channelCnt = 0;
|
||||
channelCnt += PaWin_WDMKS_QueryFilterMaximumChannelCount((void*)deviceName, 1);
|
||||
channelCnt += PaWin_WDMKS_QueryFilterMaximumChannelCount((void*)deviceName, 0);
|
||||
return (channelCnt > 0);
|
||||
}
|
||||
|
||||
static void PopulateCacheWithAvailableAudioDevices(PaHotPlugDeviceEventHandlerInfo* pInfo)
|
||||
{
|
||||
HDEVINFO handle = NULL;
|
||||
const int sizeInterface = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + (MAX_PATH * sizeof(WCHAR));
|
||||
SP_DEVICE_INTERFACE_DETAIL_DATA_W* devInterfaceDetails = (SP_DEVICE_INTERFACE_DETAIL_DATA_W*)PaUtil_AllocateMemory(sizeInterface);
|
||||
|
||||
if (devInterfaceDetails)
|
||||
{
|
||||
devInterfaceDetails->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W);
|
||||
|
||||
/* Open a handle to search for devices (filters) */
|
||||
handle = SetupDiGetClassDevsW(&KSCATEGORY_AUDIO,NULL,NULL,DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
|
||||
if( handle != NULL )
|
||||
{
|
||||
int device;
|
||||
|
||||
/* Iterate through the devices */
|
||||
for( device = 0;;device++ )
|
||||
{
|
||||
SP_DEVICE_INTERFACE_DATA interfaceData;
|
||||
SP_DEVINFO_DATA devInfoData;
|
||||
int noError;
|
||||
|
||||
interfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
|
||||
interfaceData.Reserved = 0;
|
||||
devInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
|
||||
devInfoData.Reserved = 0;
|
||||
|
||||
noError = SetupDiEnumDeviceInterfaces(handle,NULL,&KSCATEGORY_AUDIO,device,&interfaceData);
|
||||
if( !noError )
|
||||
break; /* No more devices */
|
||||
|
||||
noError = SetupDiGetDeviceInterfaceDetailW(handle,&interfaceData,devInterfaceDetails,sizeInterface,NULL,&devInfoData);
|
||||
if( noError )
|
||||
{
|
||||
if (IsDeviceAudio(devInterfaceDetails->DevicePath))
|
||||
{
|
||||
PA_DEBUG(("Hotplug cache populated with: '%S'\n", devInterfaceDetails->DevicePath));
|
||||
InsertDeviceIntoCache(pInfo, devInterfaceDetails->DevicePath);
|
||||
}
|
||||
}
|
||||
}
|
||||
SetupDiDestroyDeviceInfoList(handle);
|
||||
}
|
||||
PaUtil_FreeMemory(devInterfaceDetails);
|
||||
}
|
||||
}
|
||||
|
||||
static LRESULT CALLBACK PaMsgWinProcW(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
PaHotPlugDeviceEventHandlerInfo* pInfo = (PaHotPlugDeviceEventHandlerInfo*)( GetWindowLongPtr(hWnd, GWLP_USERDATA) );
|
||||
switch(msg)
|
||||
{
|
||||
case WM_DEVICECHANGE:
|
||||
switch(wParam)
|
||||
{
|
||||
case DBT_DEVICEARRIVAL:
|
||||
{
|
||||
PDEV_BROADCAST_DEVICEINTERFACE_W ptr = (PDEV_BROADCAST_DEVICEINTERFACE_W)lParam;
|
||||
if (ptr->dbcc_devicetype != DBT_DEVTYP_DEVICEINTERFACE)
|
||||
break;
|
||||
|
||||
if (!IsEqualGUID(&ptr->dbcc_classguid, &KSCATEGORY_AUDIO))
|
||||
break;
|
||||
|
||||
if (IsDeviceAudio(ptr->dbcc_name))
|
||||
{
|
||||
PA_DEBUG(("Device inserted : %S\n", ptr->dbcc_name));
|
||||
InsertDeviceIntoCache(pInfo, ptr->dbcc_name);
|
||||
PaUtil_DevicesChanged(1, ptr->dbcc_name);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case DBT_DEVICEREMOVECOMPLETE:
|
||||
{
|
||||
PDEV_BROADCAST_DEVICEINTERFACE_W ptr = (PDEV_BROADCAST_DEVICEINTERFACE_W)lParam;
|
||||
if (ptr->dbcc_devicetype != DBT_DEVTYP_DEVICEINTERFACE)
|
||||
break;
|
||||
|
||||
if (!IsEqualGUID(&ptr->dbcc_classguid, &KSCATEGORY_AUDIO))
|
||||
break;
|
||||
|
||||
if (RemoveDeviceFromCache(pInfo, ptr->dbcc_name))
|
||||
{
|
||||
PA_DEBUG(("Device removed : %S\n", ptr->dbcc_name));
|
||||
PaUtil_DevicesChanged(2, ptr->dbcc_name);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return DefWindowProcW(hWnd, msg, wParam, lParam);
|
||||
}
|
||||
|
||||
PA_THREAD_FUNC PaRunMessageLoop(void* ptr)
|
||||
{
|
||||
PaHotPlugDeviceEventHandlerInfo* pInfo = (PaHotPlugDeviceEventHandlerInfo*)ptr;
|
||||
WNDCLASSW wnd = { 0 };
|
||||
HMODULE hInstance = GetModuleHandleW(NULL);
|
||||
|
||||
wnd.lpfnWndProc = PaMsgWinProcW;
|
||||
wnd.hInstance = hInstance;
|
||||
wnd.lpszClassName = L"{1E0D4F5A-B31F-4dcc-AE3C-4F30A47BD521}"; /* Using a GUID as class name */
|
||||
pInfo->hWnd = CreateWindowW((LPCWSTR)MAKEINTATOM(RegisterClassW(&wnd)), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, hInstance, NULL);
|
||||
if (pInfo->hWnd)
|
||||
{
|
||||
DEV_BROADCAST_DEVICEINTERFACE_W NotificationFilter = { sizeof(DEV_BROADCAST_DEVICEINTERFACE_W) };
|
||||
NotificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
|
||||
|
||||
#ifndef DEVICE_NOTIFY_ALL_INTERFACE_CLASSES
|
||||
#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
|
||||
#endif
|
||||
|
||||
pInfo->hNotify = RegisterDeviceNotificationW(
|
||||
pInfo->hWnd,
|
||||
&NotificationFilter,
|
||||
DEVICE_NOTIFY_WINDOW_HANDLE|DEVICE_NOTIFY_ALL_INTERFACE_CLASSES
|
||||
);
|
||||
|
||||
assert(pInfo->hNotify);
|
||||
|
||||
SetWindowLongPtr(pInfo->hWnd, GWLP_USERDATA, (LONG_PTR)pInfo);
|
||||
|
||||
if (pInfo->hNotify)
|
||||
{
|
||||
MSG msg;
|
||||
BOOL result;
|
||||
while((result = GetMessageW(&msg, pInfo->hWnd, 0, 0)) != 0)
|
||||
{
|
||||
if (result == -1)
|
||||
{
|
||||
break;
|
||||
}
|
||||
TranslateMessage(&msg);
|
||||
DispatchMessageW(&msg);
|
||||
}
|
||||
UnregisterDeviceNotification(pInfo->hNotify);
|
||||
pInfo->hNotify = 0;
|
||||
}
|
||||
DestroyWindow(pInfo->hWnd);
|
||||
pInfo->hWnd = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PaHotPlugDeviceEventHandlerInfo* s_handler = 0;
|
||||
|
||||
void PaUtil_InitializeHotPlug()
|
||||
{
|
||||
if (s_handler == 0)
|
||||
{
|
||||
s_handler = (PaHotPlugDeviceEventHandlerInfo*)PaUtil_AllocateMemory(sizeof(PaHotPlugDeviceEventHandlerInfo));
|
||||
if (s_handler)
|
||||
{
|
||||
s_handler->cacheAllocGroup = PaUtil_CreateAllocationGroup();
|
||||
InitializeCriticalSection(&s_handler->lock);
|
||||
PopulateCacheWithAvailableAudioDevices(s_handler);
|
||||
/* Start message thread */
|
||||
s_handler->hMsgThread = CREATE_THREAD_FUNCTION(NULL, 0, PaRunMessageLoop, s_handler, 0, NULL);
|
||||
assert(s_handler->hMsgThread != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void PaUtil_TerminateHotPlug()
|
||||
{
|
||||
if (s_handler != 0)
|
||||
{
|
||||
if (s_handler->hWnd)
|
||||
{
|
||||
PostMessage(s_handler->hWnd, WM_QUIT, 0, 0);
|
||||
if (WaitForSingleObject(s_handler->hMsgThread, 1000) == WAIT_TIMEOUT)
|
||||
{
|
||||
TerminateThread(s_handler->hMsgThread, -1);
|
||||
}
|
||||
}
|
||||
DeleteCriticalSection(&s_handler->lock);
|
||||
PaUtil_FreeAllAllocations( s_handler->cacheAllocGroup );
|
||||
PaUtil_DestroyAllocationGroup( s_handler->cacheAllocGroup );
|
||||
PaUtil_FreeMemory( s_handler );
|
||||
s_handler = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void PaUtil_LockHotPlug()
|
||||
{
|
||||
EnterCriticalSection(&s_handler->lock);
|
||||
}
|
||||
|
||||
void PaUtil_UnlockHotPlug()
|
||||
{
|
||||
LeaveCriticalSection(&s_handler->lock);
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
@author Phil Burk <philburk@softsynth.com>
|
||||
*/
|
||||
/*
|
||||
* $Id$
|
||||
* $Id: patest_leftright.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
*
|
||||
* This program uses the PortAudio Portable Audio Library.
|
||||
* For more information see: http://www.portaudio.com
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
@author Phil Burk <philburk@softsynth.com>
|
||||
*/
|
||||
/*
|
||||
* $Id$
|
||||
* $Id: patest_out_underflow.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
*
|
||||
* This program uses the PortAudio Portable Audio Library.
|
||||
* For more information see: http://www.portaudio.com
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
@author Phil Burk <philburk@softsynth.com>
|
||||
*/
|
||||
/*
|
||||
* $Id$
|
||||
* $Id: patest_two_rates.c 1661 2011-04-28 18:54:46Z rob_bielik $
|
||||
*
|
||||
* Author: Phil Burk http://www.softsynth.com
|
||||
*
|
||||
|
|
|
|||
48
test/patest_update_available_device_list.c
Normal file
48
test/patest_update_available_device_list.c
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "portaudio.h"
|
||||
|
||||
void printDevices()
|
||||
{
|
||||
int deviceCount = Pa_GetDeviceCount();
|
||||
int i;
|
||||
|
||||
for( i=0; i < deviceCount; ++i ){
|
||||
const PaDeviceInfo *deviceInfo = Pa_GetDeviceInfo(i);
|
||||
const PaHostApiInfo *hostApiInfo = Pa_GetHostApiInfo( deviceInfo->hostApi );
|
||||
|
||||
assert( deviceInfo != 0 );
|
||||
|
||||
printf( "%d %s (%s)\n", i, deviceInfo->name, hostApiInfo->name );
|
||||
}
|
||||
}
|
||||
|
||||
static void devicesChangedCallback(void* p)
|
||||
{
|
||||
(void)p;
|
||||
|
||||
printf( "Portaudio device list have changed!\n" );
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
Pa_Initialize();
|
||||
|
||||
Pa_SetDevicesChangedCallback(NULL, devicesChangedCallback);
|
||||
|
||||
for(;;){
|
||||
printDevices();
|
||||
|
||||
printf( "press [enter] to update the device list. or q + [enter] to quit.\n" );
|
||||
if( getchar() == 'q' )
|
||||
break;
|
||||
|
||||
Pa_UpdateAvailableDeviceList();
|
||||
}
|
||||
|
||||
Pa_Terminate();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in a new issue