Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5401d942a41..8ded4aeef31 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -705,7 +705,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct parser_source *pin = gst_pad_get_element_private(pad); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter);
- TRACE("pin %p, type "%s".\n", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("pin %p, type "%s".", pin, GST_EVENT_TYPE_NAME(event));
switch (event->type) { @@ -719,7 +719,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event)
if (segment->format != GST_FORMAT_TIME) { - FIXME("Unhandled format "%s".\n", gst_format_get_name(segment->format)); + GST_FIXME("Unhandled format "%s".", gst_format_get_name(segment->format)); break; }
@@ -798,7 +798,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) }
default: - WARN("Ignoring "%s" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring "%s" event.", GST_EVENT_TYPE_NAME(event)); } gst_event_unref(event); return TRUE;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- 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;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68459a5133c..3efec0f5295 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -622,7 +622,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event)
if (seek_format != GST_FORMAT_BYTES) { - FIXME("Unhandled format "%s".\n", gst_format_get_name(seek_format)); + GST_FIXME("Unhandled format "%s".", gst_format_get_name(seek_format)); return FALSE; }
@@ -657,7 +657,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) struct parser *This = gst_pad_get_element_private(pad); gboolean ret = TRUE;
- TRACE("filter %p, type "%s".\n", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("filter %p, type "%s".", This, GST_EVENT_TYPE_NAME(event));
switch (event->type) { @@ -672,7 +672,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) break;
default: - WARN("Ignoring "%s" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring "%s" event.", GST_EVENT_TYPE_NAME(event)); ret = FALSE; break; }
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 ce7c0de4e1a..4b22c445798 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -190,19 +190,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 return cbdata.u.getrange_data.ret; }
-gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) -{ - struct cb_data cbdata = { EVENT_SRC }; - - cbdata.u.event_src_data.pad = pad; - cbdata.u.event_src_data.parent = parent; - cbdata.u.event_src_data.event = event; - - call_cb(&cbdata); - - return cbdata.u.event_src_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 29aa2bd662c..c7c559c664c 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -34,7 +34,6 @@ enum CB_TYPE { QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, - EVENT_SRC, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -121,7 +120,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS 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; -gboolean event_src_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 3efec0f5295..b6c92e4807c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1518,7 +1518,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) 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_activatemode_function(This->my_src, activate_mode_wrapper); - gst_pad_set_event_function(This->my_src, event_src_wrapper); + gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This);
This->start = This->nextofs = This->nextpullofs = This->stop = 0; @@ -2453,12 +2453,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->ofs, data->len, data->buf); break; } - case EVENT_SRC: - { - struct event_src_data *data = &cbdata->u.event_src_data; - cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b6c92e4807c..a6ecaafd81b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1321,7 +1321,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) struct parser *This = gst_pad_get_element_private(pad); GstFormat format;
- TRACE("filter %p, type %s.\n", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query));
switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1341,7 +1341,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_seeking (query, &format, NULL, NULL, NULL); if (format != GST_FORMAT_BYTES) { - WARN("Cannot seek using format "%s".\n", gst_format_get_name(format)); + GST_WARNING("Cannot seek using format "%s".", gst_format_get_name(format)); return FALSE; } gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, This->filesize); @@ -1352,7 +1352,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); return TRUE; default: - WARN("Unhandled query type %s.\n", GST_QUERY_TYPE_NAME(query)); + GST_WARNING("Unhandled query type %s.", GST_QUERY_TYPE_NAME(query)); return FALSE; } }
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;
-
Zebediah Figura