winepulse: Simplify IAudioStreamVolume::GetChannelVolume implementation.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winepulse: Simplify IAudioStreamVolume::GetChannelVolume implementation.
4432b66e · Jacek Caban · Alexandre Julliard · 6a629656 · 4432b66e
Commit 4432b66e authored May 24, 2021 by Jacek Caban Committed by Alexandre Julliard May 25, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

mmdevdrv.c dlls/winepulse.drv/mmdevdrv.c +6 -6

No files found.
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -1494,21 +1494,21 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume(
        IAudioStreamVolume *iface, UINT32 index, float *level)
 {
    ACImpl *This = impl_from_IAudioStreamVolume(iface);
-    float volumes[PA_CHANNELS_MAX];
-    HRESULT hr;

    TRACE("(%p)->(%d, %p)\n", This, index, level);

    if (!level)
        return E_POINTER;

+    if (!This->pulse_stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
    if (index >= This->channel_count)
        return E_INVALIDARG;

-    hr = AudioStreamVolume_GetAllVolumes(iface, This->channel_count, volumes);
-    if (SUCCEEDED(hr))
-        *level = volumes[index];
-    return hr;
+    pulse->lock();
+    *level = This->vol[index];
+    pulse->unlock();
+    return S_OK;
 }

 static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl =