Rémi Bernon : winegstreamer: Use IWMSyncReader2_SetStreamsSelected in the async reader.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f6f105cc0541abdbd6e39fef2749347a52d1b97
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0f6f105cc0541abdbd6e39fef274934...

Author: Rémi Bernon 
Date:   Mon Aug 22 13:35:52 2022 +0200

winegstreamer: Use IWMSyncReader2_SetStreamsSelected in the async reader.

---

dlls/winegstreamer/gst_private.h    |  2 -
 dlls/winegstreamer/wm_asyncreader.c |  2 +-
 dlls/winegstreamer/wm_reader.c      | 83 +++++++++++++++++--------------------
 3 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 53588d0c8ab..178679c38ee 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -193,7 +193,5 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA
         INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number);
 HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate);
 HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate);
-HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count,
-        const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections);

#endif /* __GST_PRIVATE_INCLUDED__ */
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index f84f6aba0bf..f5509cd865d 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -701,7 +701,7 @@ static HRESULT WINAPI WMReaderAdvanced_SetStreamsSelected(IWMReaderAdvanced6 *if
     TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n",
             reader, count, stream_numbers, selections);

-    return wm_reader_set_streams_selected(reader->wm_reader, count, stream_numbers, selections);
+    return IWMSyncReader2_SetStreamsSelected(reader->reader, count, stream_numbers, selections);
 }

static HRESULT WINAPI WMReaderAdvanced_GetStreamSelected(IWMReaderAdvanced6 *iface,
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index e4ee11239f6..95d6d8e0180 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1696,50 +1696,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA
     }
 }

-HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count,
-        const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections)
-{
-    struct wm_stream *stream;
-    WORD i;
-
-    if (!count)
-        return E_INVALIDARG;
-
-    EnterCriticalSection(&reader->cs);
-
-    for (i = 0; i < count; ++i)
-    {
-        if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i])))
-        {
-            LeaveCriticalSection(&reader->cs);
-            WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]);
-            return NS_E_INVALID_REQUEST;
-        }
-    }
-
-    for (i = 0; i < count; ++i)
-    {
-        stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]);
-        stream->selection = selections[i];
-        if (selections[i] == WMT_OFF)
-        {
-            TRACE("Disabling stream %u.\n", stream_numbers[i]);
-            wg_parser_stream_disable(stream->wg_stream);
-        }
-        else if (selections[i] == WMT_ON)
-        {
-            if (selections[i] != WMT_ON)
-                FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n",
-                        selections[i], stream_numbers[i]);
-            TRACE("Enabling stream %u.\n", stream_numbers[i]);
-            wg_parser_stream_enable(stream->wg_stream, &stream->format);
-        }
-    }
-
-    LeaveCriticalSection(&reader->cs);
-    return S_OK;
-}
-
 HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate)
 {
     struct wm_stream *stream;
@@ -2412,11 +2368,48 @@ static HRESULT WINAPI reader_SetStreamsSelected(IWMSyncReader2 *iface,
         WORD count, WORD *stream_numbers, WMT_STREAM_SELECTION *selections)
 {
     struct wm_reader *reader = impl_from_IWMSyncReader2(iface);
+    struct wm_stream *stream;
+    WORD i;

TRACE("reader %p, count %u, stream_numbers %p, selections %p.\n",
             reader, count, stream_numbers, selections);

-    return wm_reader_set_streams_selected(reader, count, stream_numbers, selections);
+    if (!count)
+        return E_INVALIDARG;
+
+    EnterCriticalSection(&reader->cs);
+
+    for (i = 0; i < count; ++i)
+    {
+        if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i])))
+        {
+            LeaveCriticalSection(&reader->cs);
+            WARN("Invalid stream number %u; returning NS_E_INVALID_REQUEST.\n", stream_numbers[i]);
+            return NS_E_INVALID_REQUEST;
+        }
+    }
+
+    for (i = 0; i < count; ++i)
+    {
+        stream = wm_reader_get_stream_by_stream_number(reader, stream_numbers[i]);
+        stream->selection = selections[i];
+        if (selections[i] == WMT_OFF)
+        {
+            TRACE("Disabling stream %u.\n", stream_numbers[i]);
+            wg_parser_stream_disable(stream->wg_stream);
+        }
+        else if (selections[i] == WMT_ON)
+        {
+            if (selections[i] != WMT_ON)
+                FIXME("Ignoring selection %#x for stream %u; treating as enabled.\n",
+                        selections[i], stream_numbers[i]);
+            TRACE("Enabling stream %u.\n", stream_numbers[i]);
+            wg_parser_stream_enable(stream->wg_stream, &stream->format);
+        }
+    }
+
+    LeaveCriticalSection(&reader->cs);
+    return S_OK;
 }

static HRESULT WINAPI reader_SetRangeByTimecode(IWMSyncReader2 *iface, WORD stream_num,