Zebediah Figura : winegstreamer: Don't force activate_mode() onto a Wine thread.
Alexandre Julliard
julliard at winehq.org
Fri Jan 29 15:10:21 CST 2021
Module: wine
Branch: master
Commit: 8c13dde595b0841198a7d17bfc21c2997dde53b1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c13dde595b0841198a7d17bfc21c2997dde53b1
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Jan 28 18:40:16 2021 -0600
winegstreamer: Don't force activate_mode() onto a Wine thread.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/gst_cbs.c | 14 --------------
dlls/winegstreamer/gst_cbs.h | 2 --
dlls/winegstreamer/gstdemux.c | 8 +-------
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 5267091c5e1..90c34b1cb39 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -147,20 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user)
call_cb(&cbdata);
}
-gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate)
-{
- struct cb_data cbdata = { ACTIVATE_MODE };
-
- cbdata.u.activate_mode_data.pad = pad;
- cbdata.u.activate_mode_data.parent = parent;
- cbdata.u.activate_mode_data.mode = mode;
- cbdata.u.activate_mode_data.activate = activate;
-
- call_cb(&cbdata);
-
- return cbdata.u.activate_mode_data.ret;
-}
-
gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query)
{
struct cb_data cbdata = { QUERY_SINK };
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index 4afde78ba7d..cbd9a630885 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -31,7 +31,6 @@ typedef enum {
enum CB_TYPE {
EXISTING_NEW_PAD,
- ACTIVATE_MODE,
QUERY_SINK,
GSTDEMUX_MAX,
BYTESTREAM_WRAPPER_PULL,
@@ -114,7 +113,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN;
void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN;
void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
-gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN;
GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN;
void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 5747cce1dd2..ea6808ec113 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1581,7 +1581,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin)
This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src");
gst_pad_set_getrange_function(This->my_src, request_buffer_src);
gst_pad_set_query_function(This->my_src, query_function);
- gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper);
+ gst_pad_set_activatemode_function(This->my_src, activate_mode);
gst_pad_set_event_function(This->my_src, event_src);
gst_pad_set_element_private (This->my_src, This);
@@ -2511,12 +2511,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
existing_new_pad(data->element, data->pad, data->user);
break;
}
- case ACTIVATE_MODE:
- {
- struct activate_mode_data *data = &cbdata->u.activate_mode_data;
- cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate);
- break;
- }
case QUERY_SINK:
{
struct query_sink_data *data = &cbdata->u.query_sink_data;
More information about the wine-cvs
mailing list