From 577fd012496b5f6f44f337371286c7ed24552bb1 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 22 Feb 2018 15:31:20 -0600 Subject: [PATCH] winegstreamer: Remove unused callbacks. These were left behind in the transition to 1.0. Signed-off-by: Zebediah Figura Signed-off-by: Andrew Eikum Signed-off-by: Alexandre Julliard --- dlls/winegstreamer/gst_cbs.c | 24 ------------------------ dlls/winegstreamer/gst_cbs.h | 14 -------------- dlls/winegstreamer/gstdemux.c | 12 ------------ 3 files changed, 50 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 96325d042f4..c8ba812c8a7 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -175,30 +175,6 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) return cbdata.u.event_sink_data.ret; } -gboolean accept_caps_sink_wrapper(GstPad *pad, GstCaps *caps) -{ - struct cb_data cbdata = { ACCEPT_CAPS_SINK }; - - cbdata.u.accept_caps_sink_data.pad = pad; - cbdata.u.accept_caps_sink_data.caps = caps; - - call_cb(&cbdata); - - return cbdata.u.accept_caps_sink_data.ret; -} - -gboolean setcaps_sink_wrapper(GstPad *pad, GstCaps *caps) -{ - struct cb_data cbdata = { SETCAPS_SINK }; - - cbdata.u.setcaps_sink_data.pad = pad; - cbdata.u.setcaps_sink_data.caps = caps; - - call_cb(&cbdata); - - return cbdata.u.setcaps_sink_data.ret; -} - GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) { struct cb_data cbdata = { GOT_DATA_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index e52d1bae8a2..100a8dece44 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -38,8 +38,6 @@ enum CB_TYPE { REQUEST_BUFFER_SRC, EVENT_SRC, EVENT_SINK, - ACCEPT_CAPS_SINK, - SETCAPS_SINK, GOT_DATA_SINK, GOT_DATA, REMOVED_DECODED_PAD, @@ -101,16 +99,6 @@ struct cb_data { GstEvent *event; gboolean ret; } event_sink_data; - struct accept_caps_sink_data { - GstPad *pad; - GstCaps *caps; - gboolean ret; - } accept_caps_sink_data; - struct setcaps_sink_data { - GstPad *pad; - GstCaps *caps; - gboolean ret; - } setcaps_sink_data; struct got_data_sink_data { GstPad *pad; GstObject *parent; @@ -179,8 +167,6 @@ void no_more_pads_wrapper(GstElement *decodebin, gpointer user) 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; -gboolean accept_caps_sink_wrapper(GstPad *pad, GstCaps *caps) DECLSPEC_HIDDEN; -gboolean setcaps_sink_wrapper(GstPad *pad, GstCaps *caps) DECLSPEC_HIDDEN; GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) 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; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9e35e3d9641..3ce7873f102 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2233,18 +2233,6 @@ void CALLBACK perform_cb(TP_CALLBACK_INSTANCE *instance, void *user) cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event); break; } - case ACCEPT_CAPS_SINK: - { - struct accept_caps_sink_data *data = &cbdata->u.accept_caps_sink_data; - cbdata->u.accept_caps_sink_data.ret = accept_caps_sink(data->pad, data->caps); - break; - } - case SETCAPS_SINK: - { - struct setcaps_sink_data *data = &cbdata->u.setcaps_sink_data; - cbdata->u.setcaps_sink_data.ret = setcaps_sink(data->pad, data->caps); - break; - } case GOT_DATA_SINK: { struct got_data_sink_data *data = &cbdata->u.got_data_sink_data; -- 2.11.4.GIT