Rémi Bernon : dmsynth: Create a fluid_synth instance on Open.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3cfa740cd73200577fe8109aa02d2e17f0298fe5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3cfa740cd73200577fe8109aa02d2e1...

Author: Rémi Bernon 
Date:   Mon Oct  2 08:59:32 2023 +0200

dmsynth: Create a fluid_synth instance on Open.

---

dlls/dmsynth/synth.c         | 9 ++++++++-
 dlls/dmsynth/tests/dmsynth.c | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 505f1387b41..48aa175698d 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -232,6 +232,7 @@ struct synth
     struct list waves;

fluid_settings_t *fluid_settings;
+    fluid_synth_t *fluid_synth;
 };

static inline struct synth *impl_from_IDirectMusicSynth8(IDirectMusicSynth8 *iface)
@@ -351,7 +352,8 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par

if ((params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) && params->dwAudioChannels)
         {
-            actual.dwAudioChannels = min(params->dwAudioChannels, This->caps.dwMaxAudioChannels);
+            /* FluidSynth only works with stereo */
+            actual.dwAudioChannels = 2;
             modified |= actual.dwAudioChannels != params->dwAudioChannels;
         }

@@ -384,6 +386,9 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par
         memcpy(params, &actual, size);
     }

+    fluid_settings_setnum(This->fluid_settings, "synth.sample-rate", actual.dwSampleRate);
+    if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY;
+
     This->params = actual;
     This->open = TRUE;

@@ -399,6 +404,8 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface)
     if (!This->open)
         return DMUS_E_ALREADYCLOSED;

+    delete_fluid_synth(This->fluid_synth);
+    This->fluid_synth = NULL;
     This->open = FALSE;

return S_OK;
diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index 64a81e33b43..26619560b42 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -437,7 +437,7 @@ static void test_dmsynth(void)
     ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams);
     ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices);
     ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups);
-    ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels);
+    todo_wine ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels);
     ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate);
     test_synth_getformat(dmsynth, &params, "min");
     IDirectMusicSynth_Close(dmsynth);
@@ -525,7 +525,7 @@ static void test_dmsynth(void)
     params.dwValidParams = DMUS_PORTPARAMS_AUDIOCHANNELS;
     params.dwAudioChannels = 1;
     hr = IDirectMusicSynth_Open(dmsynth, &params);
-    ok(hr == S_OK, "Open failed: %#lx\n", hr);
+    todo_wine_if(SUCCEEDED(hr)) ok(hr == S_OK, "Open failed: %#lx\n", hr);
     hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size);
     ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr);
     ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size);