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

hotplug: Update defaultHostApiIndex_ in Pa_RefreshDeviceList() to reflect the first host API with an input or output device (previously this was left unchanged, which could result in a default host API with zero devices, and therefore no global default devices.)

Browse source
This commit is contained in:
Ross Bencina 2016-09-19 00:43:40 +10:00
commit 5549bca961
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/common/pa_front.c
View file

@ -814,6 +814,7 @@ PaError Pa_RefreshDeviceList( void )
/* Phase 2: Commit the scan changes to each back-end */
defaultHostApiIndex_ = -1; /* indicates that we haven't determined the default host API yet */
baseDeviceIndex = 0;
deviceCount_ = 0;
for( i = 0 ; i < hostApisCount_ ; ++i )
@ -840,6 +841,16 @@ PaError Pa_RefreshDeviceList( void )
assert( hostApi->info.defaultInputDevice < hostApi->info.deviceCount );
assert( hostApi->info.defaultOutputDevice < hostApi->info.deviceCount );
/* the first successfully initialized host API with a default input *or*
output device is used as the default host API.
*/
if( (defaultHostApiIndex_ == -1) &&
( hostApi->info.defaultInputDevice != paNoDevice
|| hostApi->info.defaultOutputDevice != paNoDevice ) )
{
defaultHostApiIndex_ = i;
}
hostApi->privatePaFrontInfo.baseDeviceIndex = baseDeviceIndex;
if( hostApi->info.defaultInputDevice != paNoDevice )
@ -852,6 +863,10 @@ PaError Pa_RefreshDeviceList( void )
deviceCount_ += hostApi->info.deviceCount;
}
/* if no host APIs have devices, the default host API is the first initialized host API */
if( defaultHostApiIndex_ == -1 )
defaultHostApiIndex_ = 0;
done:
if( scanResults )