Zebediah Figura : winegstreamer: Don't force event_sink() onto a Wine thread.

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Mon Jan 25 23:29:03 2021 -0600

winegstreamer: Don't force event_sink() onto a Wine thread.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/winegstreamer/gst_cbs.c  | 13 -------------
 dlls/winegstreamer/gst_cbs.h  |  8 --------
 dlls/winegstreamer/gstdemux.c |  8 +-------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 5b163e40201..ce7c0de4e1a 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -203,19 +203,6 @@ gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event)
     return cbdata.u.event_src_data.ret;
 }

-gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event)
-{
-    struct cb_data cbdata = { EVENT_SINK };
-
-    cbdata.u.event_sink_data.pad = pad;
-    cbdata.u.event_sink_data.parent = parent;
-    cbdata.u.event_sink_data.event = event;
-
-    call_cb(&cbdata);
-
-    return cbdata.u.event_sink_data.ret;
-}
-
 void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user)
 {
     struct cb_data cbdata = { REMOVED_DECODED_PAD };
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index 2de829f72e3..29aa2bd662c 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -35,7 +35,6 @@ enum CB_TYPE {
     ACTIVATE_MODE,
     REQUEST_BUFFER_SRC,
     EVENT_SRC,
-    EVENT_SINK,
     REMOVED_DECODED_PAD,
     QUERY_SINK,
     GSTDEMUX_MAX,
@@ -95,12 +94,6 @@ struct cb_data {
             GstEvent *event;
             gboolean ret;
         } event_src_data;
-        struct event_sink_data {
-            GstPad *pad;
-            GstObject *parent;
-            GstEvent *event;
-            gboolean ret;
-        } event_sink_data;
         struct pad_removed_data {
             GstElement *element;
             GstPad *pad;
@@ -129,7 +122,6 @@ gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query)
 gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN;
 GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN;
 gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN;
-gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN;
 GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN;
 void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
 void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 8ded4aeef31..68459a5133c 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -2379,7 +2379,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name
     pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK);
     gst_pad_set_element_private(pin->my_sink, pin);
     gst_pad_set_chain_function(pin->my_sink, got_data_sink);
-    gst_pad_set_event_function(pin->my_sink, event_sink_wrapper);
+    gst_pad_set_event_function(pin->my_sink, event_sink);
     gst_pad_set_query_function(pin->my_sink, query_sink_wrapper);

filter->sources[filter->source_count++] = pin;
@@ -2459,12 +2459,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
             cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event);
             break;
         }
-    case EVENT_SINK:
-        {
-            struct event_sink_data *data = &cbdata->u.event_sink_data;
-            cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event);
-            break;
-        }
     case REMOVED_DECODED_PAD:
         {
             struct pad_removed_data *data = &cbdata->u.pad_removed_data;