Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetStreamSelected().
Alexandre Julliard
julliard at winehq.org
Wed Nov 10 15:34:47 CST 2021
Module: wine
Branch: master
Commit: a1a51f54dcb3863f9accfbf8c261407794d2bd13
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a51f54dcb3863f9accfbf8c261407794d2bd13
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Nov 10 10:41:11 2021 -0600
winegstreamer: Implement IWMSyncReader::GetStreamSelected().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/gst_private.h | 2 ++
dlls/winegstreamer/wm_reader.c | 19 +++++++++++++++++++
dlls/winegstreamer/wm_syncreader.c | 11 +++++++----
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index c7c72ab65fc..e1dec7b755c 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -168,6 +168,8 @@ struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader
WORD stream_number);
HRESULT wm_reader_get_stream_sample(struct wm_stream *stream,
INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags);
+HRESULT wm_reader_get_stream_selection(struct wm_reader *reader,
+ WORD stream_number, WMT_STREAM_SELECTION *selection);
void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops);
HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename);
HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream);
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 6b29415e363..0e0c639d504 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1872,6 +1872,25 @@ HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count,
return S_OK;
}
+HRESULT wm_reader_get_stream_selection(struct wm_reader *reader,
+ WORD stream_number, WMT_STREAM_SELECTION *selection)
+{
+ struct wm_stream *stream;
+
+ EnterCriticalSection(&reader->cs);
+
+ if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number)))
+ {
+ LeaveCriticalSection(&reader->cs);
+ return E_INVALIDARG;
+ }
+
+ *selection = stream->selection;
+
+ LeaveCriticalSection(&reader->cs);
+ return S_OK;
+}
+
void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops)
{
reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl;
diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c
index 3e980c59601..73bbf18898f 100644
--- a/dlls/winegstreamer/wm_syncreader.c
+++ b/dlls/winegstreamer/wm_syncreader.c
@@ -221,11 +221,14 @@ static HRESULT WINAPI WMSyncReader_GetStreamNumberForOutput(IWMSyncReader2 *ifac
return S_OK;
}
-static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface, WORD stream_num, WMT_STREAM_SELECTION *selection)
+static HRESULT WINAPI WMSyncReader_GetStreamSelected(IWMSyncReader2 *iface,
+ WORD stream_number, WMT_STREAM_SELECTION *selection)
{
- struct sync_reader *This = impl_from_IWMSyncReader2(iface);
- FIXME("(%p)->(%d %p): stub!\n", This, stream_num, selection);
- return E_NOTIMPL;
+ struct sync_reader *reader = impl_from_IWMSyncReader2(iface);
+
+ TRACE("reader %p, stream_number %u, selection %p.\n", reader, stream_number, selection);
+
+ return wm_reader_get_stream_selection(&reader->reader, stream_number, selection);
}
static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *filename)
More information about the wine-cvs
mailing list