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

derive ds output channel count from speaker configuration when pnpInterface is unavailable (eg wavemapper). Thanks to Dmitry Kostjuchenko for the patch.

Browse source
This commit is contained in:
rossb 2009-12-09 01:55:50 +00:00
commit 0263158765
1 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/hostapi/dsound/pa_win_ds.c
View file

@ -725,6 +725,40 @@ static PaError AddOutputDeviceInfoFromDirectSound(
winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
}
/* Guess channels count from speaker configuration. We do it only when
pnpInterface is NULL or when PAWIN_USE_WDMKS_DEVICE_INFO is undefined.
*/
#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
if( !pnpInterface )
#endif
{
DWORD spkrcfg;
if( SUCCEEDED(IDirectSound_GetSpeakerConfig( lpDirectSound, &spkrcfg )) )
{
int count = 0;
switch (DSSPEAKER_CONFIG(spkrcfg))
{
case DSSPEAKER_HEADPHONE: count = 2; break;
case DSSPEAKER_MONO: count = 1; break;
case DSSPEAKER_QUAD: count = 4; break;
case DSSPEAKER_STEREO: count = 2; break;
case DSSPEAKER_SURROUND: count = 4; break;
case DSSPEAKER_5POINT1: count = 6; break;
case DSSPEAKER_7POINT1: count = 8; break;
case DSSPEAKER_7POINT1_SURROUND: count = 8; break;
#ifndef DSSPEAKER_5POINT1_SURROUND
#define DSSPEAKER_5POINT1_SURROUND 0x00000009
#endif
case DSSPEAKER_5POINT1_SURROUND: count = 6; break;
}
if( count )
{
deviceInfo->maxOutputChannels = count;
winDsDeviceInfo->deviceOutputChannelCountIsKnown = 1;
}
}
}
#ifdef PAWIN_USE_WDMKS_DEVICE_INFO
if( pnpInterface )
{