Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 4b22c445798..6c5877ce785 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,19 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); }
-gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) -{ - struct cb_data cbdata = { QUERY_FUNCTION }; - - cbdata.u.query_function_data.pad = pad; - cbdata.u.query_function_data.parent = parent; - cbdata.u.query_function_data.query = query; - - call_cb(&cbdata); - - return cbdata.u.query_function_data.ret; -} - gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { struct cb_data cbdata = { ACTIVATE_MODE }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index c7c559c664c..f063a0a2a7b 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, - QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, REMOVED_DECODED_PAD, @@ -117,7 +116,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 query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; 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; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a6ecaafd81b..5181d0951d5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1516,7 +1516,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_wrapper); - gst_pad_set_query_function(This->my_src, query_function_wrapper); + gst_pad_set_query_function(This->my_src, query_function); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2434,12 +2434,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case QUERY_FUNCTION: - { - struct query_function_data *data = &cbdata->u.query_function_data; - cbdata->u.query_function_data.ret = query_function(data->pad, data->parent, data->query); - break; - } case ACTIVATE_MODE: { struct activate_mode_data *data = &cbdata->u.activate_mode_data;