winealsa.drv: Default to Stereo instead of 5.1 Surround.

Some popular ALSA plugins claim support for a large number of channels because they have the capability to mix that down to the actual hardware configuration. Instead of defaulting to 5.1 Surround sound for these plugins, let's fall back on the much more common Stereo configuration. Users with actual 5.1 Surround setups can tell us about it in winecfg.

winealsa.drv: Default to Stereo instead of 5.1 Surround.
b8753ada · Andrew Eikum · Alexandre Julliard · ed318c91 · b8753ada
Commit b8753ada authored May 18, 2015 by Andrew Eikum Committed by Alexandre Julliard May 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mmdevdrv.c dlls/winealsa.drv/mmdevdrv.c +4 -2

No files found.
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1828,7 +1828,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
    }

    if(max_channels > 6)
-        fmt->Format.nChannels = 6;
+        fmt->Format.nChannels = 2;
    else
        fmt->Format.nChannels = max_channels;

@@ -4068,7 +4068,9 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI

        out->vt = VT_UI4;

-        if (num_speakers >= 6)
+        if (num_speakers > 6)
+            out->u.ulVal = KSAUDIO_SPEAKER_STEREO;
+        else if (num_speakers == 6)
            out->u.ulVal = KSAUDIO_SPEAKER_5POINT1;
        else if (num_speakers >= 4)
            out->u.ulVal = KSAUDIO_SPEAKER_QUAD;