playback: Remove USE_PLAYBIN3 registration override

This was only introduced as a convenience for testing playbin3 instead of
playbin2.

Now that playbin3 is (explicitely) default in many cases, we should not do this
hack anymore

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6255>

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
index 8d3a72ba3888bd3b7c24aa6560ef8229cf2bcce5..7f9c2c3faaef958e65606e6679a3334acb4bf4cd 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
@@ -39,9 +39,8 @@ static gboolean
 plugin_init (GstPlugin * plugin)
 {
   gboolean res = FALSE;
-  if (!g_getenv ("USE_PLAYBIN3"))
-    res |= GST_ELEMENT_REGISTER (playbin, plugin);
 
+  res |= GST_ELEMENT_REGISTER (playbin, plugin);
   res |= GST_ELEMENT_REGISTER (playbin3, plugin);
   res |= GST_ELEMENT_REGISTER (playsink, plugin);
   res |= GST_ELEMENT_REGISTER (subtitleoverlay, plugin);

diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
index 047f558954cedfa3a733e0ef39914673cc40fa39..a24186ad329c9bdceda68b1421cf337d76838fcf 100644 (file)
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
@@ -2898,11 +2898,6 @@ gst_play_bin3_custom_element_init (GstPlugin * plugin)
 
   playback_element_init (plugin);
 
-  if (g_getenv ("USE_PLAYBIN3")) {
-    ret &= gst_element_register (plugin, "playbin", GST_RANK_NONE,
-        GST_TYPE_PLAY_BIN);
-  }
-
   ret &= gst_element_register (plugin, "playbin3", GST_RANK_NONE,
       GST_TYPE_PLAY_BIN);