[PATCH 1/4] winegstreamer: Get rid of the unknown_type() callback.
Zebediah Figura
z.figura12 at gmail.com
Thu Jan 14 10:37:50 CST 2021
This information is already printed by GStreamer via GST_MESSAGE_ERROR.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/winegstreamer/gst_cbs.c | 12 ------------
dlls/winegstreamer/gst_cbs.h | 8 --------
dlls/winegstreamer/gstdemux.c | 14 --------------
3 files changed, 34 deletions(-)
diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index 51aaefa911d..e6b9a30d466 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -279,18 +279,6 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad,
return cbdata.u.autoplug_blacklist_data.ret;
}
-void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user)
-{
- struct cb_data cbdata = { UNKNOWN_TYPE };
-
- cbdata.u.unknown_type_data.bin = bin;
- cbdata.u.unknown_type_data.pad = pad;
- cbdata.u.unknown_type_data.caps = caps;
- cbdata.u.unknown_type_data.user = user;
-
- call_cb(&cbdata);
-}
-
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 a48999bbf71..546443bb4c6 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -41,7 +41,6 @@ enum CB_TYPE {
GOT_DATA_SINK,
REMOVED_DECODED_PAD,
AUTOPLUG_BLACKLIST,
- UNKNOWN_TYPE,
QUERY_SINK,
GSTDEMUX_MAX,
BYTESTREAM_WRAPPER_PULL,
@@ -125,12 +124,6 @@ struct cb_data {
gpointer user;
GstAutoplugSelectResult ret;
} autoplug_blacklist_data;
- struct unknown_type_data {
- GstElement *bin;
- GstPad *pad;
- GstCaps *caps;
- gpointer user;
- } unknown_type_data;
struct query_sink_data {
GstPad *pad;
GstObject *parent;
@@ -161,7 +154,6 @@ GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *b
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;
GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN;
-void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) 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;
GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 1e91c9f8e7e..992cdf01755 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1352,13 +1352,6 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data)
return GST_BUS_DROP;
}
-static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user)
-{
- gchar *strcaps = gst_caps_to_string(caps);
- ERR("Could not find a filter for caps: %s\n", debugstr_a(strcaps));
- g_free(strcaps);
-}
-
static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin)
{
LONGLONG avail;
@@ -1691,7 +1684,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter)
g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter);
g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter);
g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter);
- g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter);
g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter);
filter->their_sink = gst_element_get_static_pad(element, "sink");
@@ -2339,12 +2331,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
data->pad, data->caps, data->fact, data->user);
break;
}
- case UNKNOWN_TYPE:
- {
- struct unknown_type_data *data = &cbdata->u.unknown_type_data;
- unknown_type(data->bin, data->pad, data->caps, data->user);
- break;
- }
case QUERY_SINK:
{
struct query_sink_data *data = &cbdata->u.query_sink_data;
--
2.30.0
More information about the wine-devel
mailing list