marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Get speaker config from mmdevice props. 

Use PKEY_AudioEndpoint_PhysicalSpeakers to set the speaker config in dsound.
oldstable
Mark Harmstone 2014-12-31 20:49:21 +00:00 committed by Alexandre Julliard
parent a48c7fe408
commit 52345858d0
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/dsound/primary.c
View File

@ -146,6 +146,49 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client
return S_OK;
}
static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice)
{
IPropertyStore *store;
HRESULT hr;
PROPVARIANT pv;
ULONG phys_speakers;
const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE);
hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store);
if (FAILED(hr)) {
WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr);
return def;
}
hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv);
if (FAILED(hr)) {
WARN("IPropertyStore_GetValue failed: %08x\n", hr);
IPropertyStore_Release(store);
return def;
}
if (pv.vt != VT_UI4) {
WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt);
PropVariantClear(&pv);
IPropertyStore_Release(store);
return def;
}
phys_speakers = pv.u.ulVal;
PropVariantClear(&pv);
IPropertyStore_Release(store);
if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO)
return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE);
else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO)
return DSSPEAKER_MONO;
return def;
}
HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
{
UINT prebuf_frames;
@ -181,6 +224,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
return hres;
}
device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice);
hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx);
if (FAILED(hres)) {
IAudioClient_Release(device->client);