[PATCH] winegstreamer: Change blacklist to a more neutral word (try 2)

[André Hentschel]

Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
 dlls/winegstreamer/gst_cbs.c  | 16 ++++++++--------
 dlls/winegstreamer/gst_cbs.h  |  8 ++++----
 dlls/winegstreamer/gstdemux.c | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c
index bf7103b1606..6959eb33a5a 100644
--- a/dlls/winegstreamer/gst_cbs.c
+++ b/dlls/winegstreamer/gst_cbs.c
@@ -261,20 +261,20 @@ void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user)
     call_cb(&cbdata);
 }
 
-GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad,
+GstAutoplugSelectResult autoplug_banned_wrapper(GstElement *bin, GstPad *pad,
         GstCaps *caps, GstElementFactory *fact, gpointer user)
 {
-    struct cb_data cbdata = { AUTOPLUG_BLACKLIST };
+    struct cb_data cbdata = { AUTOPLUG_BANNED };
 
-    cbdata.u.autoplug_blacklist_data.bin = bin;
-    cbdata.u.autoplug_blacklist_data.pad = pad;
-    cbdata.u.autoplug_blacklist_data.caps = caps;
-    cbdata.u.autoplug_blacklist_data.fact = fact;
-    cbdata.u.autoplug_blacklist_data.user = user;
+    cbdata.u.autoplug_banned_data.bin = bin;
+    cbdata.u.autoplug_banned_data.pad = pad;
+    cbdata.u.autoplug_banned_data.caps = caps;
+    cbdata.u.autoplug_banned_data.fact = fact;
+    cbdata.u.autoplug_banned_data.user = user;
 
     call_cb(&cbdata);
 
-    return cbdata.u.autoplug_blacklist_data.ret;
+    return cbdata.u.autoplug_banned_data.ret;
 }
 
 void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user)
diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h
index 4725f23ad1a..5740a8e6e8f 100644
--- a/dlls/winegstreamer/gst_cbs.h
+++ b/dlls/winegstreamer/gst_cbs.h
@@ -40,7 +40,7 @@ enum CB_TYPE {
     EVENT_SINK,
     GOT_DATA_SINK,
     REMOVED_DECODED_PAD,
-    AUTOPLUG_BLACKLIST,
+    AUTOPLUG_BANNED,
     UNKNOWN_TYPE,
     QUERY_SINK,
     GSTDEMUX_MAX
@@ -108,14 +108,14 @@ struct cb_data {
             GstPad *pad;
             gpointer user;
         } pad_removed_data;
-        struct autoplug_blacklist_data {
+        struct autoplug_banned_data {
             GstElement *bin;
             GstPad *pad;
             GstCaps *caps;
             GstElementFactory *fact;
             gpointer user;
             GstAutoplugSelectResult ret;
-        } autoplug_blacklist_data;
+        } autoplug_banned_data;
         struct unknown_type_data {
             GstElement *bin;
             GstPad *pad;
@@ -150,7 +150,7 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DEC
 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;
-GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN;
+GstAutoplugSelectResult autoplug_banned_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;
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index b9c91245f82..8af0758ca02 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1232,12 +1232,12 @@ static void no_more_pads(GstElement *decodebin, gpointer user)
     SetEvent(filter->no_more_pads_event);
 }
 
-static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user)
+static GstAutoplugSelectResult autoplug_banned(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user)
 {
     const char *name = gst_element_factory_get_longname(fact);
 
     if (strstr(name, "Player protection")) {
-        WARN("Blacklisted a/52 decoder because it only works in Totem\n");
+        WARN("Banned a/52 decoder because it only works in Totem\n");
         return GST_AUTOPLUG_SELECT_SKIP;
     }
     if (!strcmp(name, "Fluendo Hardware Accelerated Video Decoder")) {
@@ -1619,7 +1619,7 @@ 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, "autoplug-select", G_CALLBACK(autoplug_banned_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);
 
@@ -2276,10 +2276,10 @@ void perform_cb_gstdemux(struct cb_data *cbdata)
             removed_decoded_pad(data->element, data->pad, data->user);
             break;
         }
-    case AUTOPLUG_BLACKLIST:
+    case AUTOPLUG_BANNED:
         {
-            struct autoplug_blacklist_data *data = &cbdata->u.autoplug_blacklist_data;
-            cbdata->u.autoplug_blacklist_data.ret = autoplug_blacklist(data->bin,
+            struct autoplug_banned_data *data = &cbdata->u.autoplug_banned_data;
+            cbdata->u.autoplug_banned_data.ret = autoplug_banned(data->bin,
                     data->pad, data->caps, data->fact, data->user);
             break;
         }
-- 
2.17.1