Module: wine Branch: master Commit: 416f0156d6d3bc328f6a2192e49195a000743150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416f0156d6d3bc328f6a2192e4...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Mon Apr 19 11:52:48 2010 +0200
mmdevapi: Set PKEY_AudioEngine_DeviceFormat for capture too.
---
dlls/mmdevapi/devenum.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a75340c..977f25a 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -840,6 +840,7 @@ static void openal_scancapture(void) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); if (devstr && *devstr) for (; *devstr; devstr += strlen(devstr)+1) { + MMDevice *mmdev; ALint freq = 44100; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); @@ -850,10 +851,11 @@ static void openal_scancapture(void) } TRACE("Adding %s\n", devstr); dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); - MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); - if (dev) + MMDevice_Create(&mmdev, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); + if (dev) { + openal_setformat(mmdev, freq); palcCaptureCloseDevice(dev); - else + } else WARN("Could not open device: %04x\n", palcGetError(NULL)); } LeaveCriticalSection(&openal_crst);