From 3f7f9145d23e35200b22a39949ac71531bbbc350 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 4 Mar 2024 12:22:25 +0100 Subject: [PATCH] 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: --- .../gst-plugins-base/gst/playback/gstplaybackplugin.c | 3 +-- subprojects/gst-plugins-base/gst/playback/gstplaybin3.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c index 8d3a72ba38..7f9c2c3faa 100644 --- 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 047f558954..a24186ad32 100644 --- 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);