Zebediah Figura : xaudio2: Move CreateAudioVolumeMeter() and CreateAudioReverb() to xapo.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 77a83bc4bb57a4a1b216eb0480b9593412b58a34
URL:    https://gitlab.winehq.org/wine/wine/-/commit/77a83bc4bb57a4a1b216eb0480b9593...

Author: Zebediah Figura 
Date:   Thu Jun  1 16:25:08 2023 -0500

xaudio2: Move CreateAudioVolumeMeter() and CreateAudioReverb() to xapo.c.

---

dlls/xaudio2_7/xapo.c       | 38 ++++++++++++++++++++++++++++++++++++++
 dlls/xaudio2_7/xaudio_dll.c | 36 ------------------------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c
index 1451816df9c..75153ce8cd4 100644
--- a/dlls/xaudio2_7/xapo.c
+++ b/dlls/xaudio2_7/xapo.c
@@ -409,3 +409,41 @@ HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv)
         HeapFree(GetProcessHeap(), 0, ret);
     return hr;
 }
+
+#if XAUDIO2_VER >= 8
+HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out)
+{
+    IClassFactory *cf;
+    HRESULT hr;
+
+    TRACE("%p\n", out);
+
+    hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf);
+    if(FAILED(hr))
+        return hr;
+
+    hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
+
+    IClassFactory_Release(cf);
+
+    return hr;
+}
+
+HRESULT WINAPI CreateAudioReverb(IUnknown **out)
+{
+    IClassFactory *cf;
+    HRESULT hr;
+
+    TRACE("%p\n", out);
+
+    hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf);
+    if(FAILED(hr))
+        return hr;
+
+    hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
+
+    IClassFactory_Release(cf);
+
+    return hr;
+}
+#endif
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index 5730e0b8811..ab759b678a9 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1979,40 +1979,4 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p

return S_OK;
 }
-
-HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out)
-{
-    IClassFactory *cf;
-    HRESULT hr;
-
-    TRACE("%p\n", out);
-
-    hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf);
-    if(FAILED(hr))
-        return hr;
-
-    hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
-
-    IClassFactory_Release(cf);
-
-    return hr;
-}
-
-HRESULT WINAPI CreateAudioReverb(IUnknown **out)
-{
-    IClassFactory *cf;
-    HRESULT hr;
-
-    TRACE("%p\n", out);
-
-    hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf);
-    if(FAILED(hr))
-        return hr;
-
-    hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
-
-    IClassFactory_Release(cf);
-
-    return hr;
-}
 #endif /* XAUDIO2_VER >= 8 */