Zebediah Figura : amstream: Forward IMultiMediaStream::GetMediaStream() to the stream filter.

Alexandre Julliard julliard at winehq.org
Mon Sep 2 14:50:19 CDT 2019


Module: wine
Branch: master
Commit: 6d6ea5dc7db57c1b458aeb71804d7bea10c1b6ad
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6d6ea5dc7db57c1b458aeb71804d7bea10c1b6ad

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Sun Sep  1 19:48:06 2019 -0500

amstream: Forward IMultiMediaStream::GetMediaStream() to the stream filter.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/amstream/multimedia.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c
index 7b0b6ae..1449c45 100644
--- a/dlls/amstream/multimedia.c
+++ b/dlls/amstream/multimedia.c
@@ -121,26 +121,13 @@ static HRESULT WINAPI multimedia_stream_GetInformation(IAMMultiMediaStream *ifac
 }
 
 static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *iface,
-        REFMSPID idPurpose, IMediaStream **ppMediaStream)
+        REFMSPID id, IMediaStream **stream)
 {
-    struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface);
-    MSPID PurposeId;
-    unsigned int i;
-
-    TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_guid(idPurpose), ppMediaStream);
+    struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface);
 
-    for (i = 0; i < This->nbStreams; i++)
-    {
-        IAMMediaStream_GetInformation(This->pStreams[i], &PurposeId, NULL);
-        if (IsEqualIID(&PurposeId, idPurpose))
-        {
-            *ppMediaStream = (IMediaStream*)This->pStreams[i];
-            IMediaStream_AddRef(*ppMediaStream);
-            return S_OK;
-        }
-    }
+    TRACE("mmstream %p, id %s, stream %p.\n", mmstream, debugstr_guid(id), stream);
 
-    return MS_E_NOSTREAM;
+    return IMediaStreamFilter_GetMediaStream(mmstream->filter, id, stream);
 }
 
 static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface,




More information about the wine-cvs mailing list