[PATCH 3/5] dsound: Simplify computing the mixing format.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 dlls/dsound/primary.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index eefbf3affa3..340e00bd8a0 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -115,33 +115,31 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client
     HRESULT hr;

if (!forcewave) {
-        WAVEFORMATEXTENSIBLE *mixwfe, testwfe;
+        WAVEFORMATEXTENSIBLE *mixwfe, wfe;

hr = IAudioClient_GetMixFormat(client, (WAVEFORMATEX**)&mixwfe);
-
         if (FAILED(hr))
             return hr;

-        if (mixwfe->Format.nChannels < device->num_speakers) {
+        wfe = *mixwfe;
+        CoTaskMemFree(mixwfe);
+
+        wfe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+        wfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+        wfe.Samples.wValidBitsPerSample = wfe.Format.wBitsPerSample = 32;
+
+        if (wfe.Format.nChannels < device->num_speakers) {
             device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, mixwfe->Format.nChannels);
             DSOUND_ParseSpeakerConfig(device);
         } else if (mixwfe->Format.nChannels > device->num_speakers) {
-            mixwfe->Format.nChannels = device->num_speakers;
-            mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8;
-            mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign;
-            mixwfe->dwChannelMask = speaker_config_to_channel_mask(device->speaker_config);
+            wfe.Format.nChannels = device->num_speakers;
+            wfe.dwChannelMask = speaker_config_to_channel_mask(device->speaker_config);
         }

-		testwfe = *mixwfe;
+        wfe.Format.nBlockAlign = wfe.Format.nChannels * wfe.Format.wBitsPerSample / 8;
+        wfe.Format.nAvgBytesPerSec = wfe.Format.nSamplesPerSec * wfe.Format.nBlockAlign;

-		testwfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
-		testwfe.Samples.wValidBitsPerSample = testwfe.Format.wBitsPerSample = 32;
-		testwfe.Format.nBlockAlign = testwfe.Format.nChannels * testwfe.Format.wBitsPerSample / 8;
-		testwfe.Format.nAvgBytesPerSec = testwfe.Format.nSamplesPerSec * testwfe.Format.nBlockAlign;
-
-		w = DSOUND_CopyFormat(&testwfe.Format);
-
-        CoTaskMemFree(mixwfe);
+        w = DSOUND_CopyFormat(&wfe.Format);
     } else if (device->primary_pwfx->wFormatTag == WAVE_FORMAT_PCM ||
                device->primary_pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) {
         WAVEFORMATEX *wi = device->primary_pwfx;