gl: Rename GST_TYPE_GL_STEREO_DOWNMIX GType macro everywhere

The old one still exists but behind GST_DISABLE_DEPRECATED

diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index ba6cdd3..5256114 100644 (file)
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -4533,7 +4533,7 @@ gst_gl_view_convert_perform
 gst_gl_view_convert_reset
 gst_gl_view_convert_set_context
 <SUBSECTION Standard>
-GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE
+GST_TYPE_GL_STEREO_DOWNMIX
 gst_gl_stereo_downmix_mode_get_type
 GST_IS_GL_VIEW_CONVERT
 GST_IS_GL_VIEW_CONVERT_CLASS

diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
index 43653bb..860bcfd 100644 (file)
--- a/ext/gl/gstglimagesink.c
+++ b/ext/gl/gstglimagesink.c
@@ -283,7 +283,7 @@ gst_gl_image_sink_bin_class_init (GstGLImageSinkBinClass * klass)
       g_param_spec_enum ("output-multiview-downmix-mode",
           "Mode for mono downmixed output",
           "Output anaglyph type to generate when downmixing to mono",
-          GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, DEFAULT_MULTIVIEW_DOWNMIX,
+          GST_TYPE_GL_STEREO_DOWNMIX, DEFAULT_MULTIVIEW_DOWNMIX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gst_video_overlay_install_properties (gobject_class, PROP_BIN_LAST);
@@ -694,7 +694,7 @@ gst_glimage_sink_class_init (GstGLImageSinkClass * klass)
       g_param_spec_enum ("output-multiview-downmix-mode",
           "Mode for mono downmixed output",
           "Output anaglyph type to generate when downmixing to mono",
-          GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, DEFAULT_MULTIVIEW_DOWNMIX,
+          GST_TYPE_GL_STEREO_DOWNMIX, DEFAULT_MULTIVIEW_DOWNMIX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gst_video_overlay_install_properties (gobject_class, PROP_LAST);

diff --git a/ext/gl/gstglstereomix.c b/ext/gl/gstglstereomix.c
index 42020a2..69760c8 100644 (file)
--- a/ext/gl/gstglstereomix.c
+++ b/ext/gl/gstglstereomix.c
@@ -176,7 +176,7 @@ gst_gl_stereo_mix_class_init (GstGLStereoMixClass * klass)
   g_object_class_install_property (gobject_class, PROP_DOWNMIX_MODE,
       g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output",
           "Output anaglyph type to generate when downmixing to mono",
-          GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, DEFAULT_DOWNMIX,
+          GST_TYPE_GL_STEREO_DOWNMIX, DEFAULT_DOWNMIX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gst_element_class_add_static_pad_template_with_gtype (element_class,

diff --git a/ext/gl/gstglviewconvert.c b/ext/gl/gstglviewconvert.c
index 203df6b..86cacd6 100644 (file)
--- a/ext/gl/gstglviewconvert.c
+++ b/ext/gl/gstglviewconvert.c
@@ -154,7 +154,7 @@ gst_gl_view_convert_element_class_init (GstGLViewConvertElementClass * klass)
   g_object_class_install_property (gobject_class, PROP_OUTPUT_DOWNMIX_MODE,
       g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output",
           "Output anaglyph type to generate when downmixing to mono",
-          GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, DEFAULT_DOWNMIX,
+          GST_TYPE_GL_STEREO_DOWNMIX, DEFAULT_DOWNMIX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 

diff --git a/tests/examples/gl/gtk/3dvideo/mviewwidget.c b/tests/examples/gl/gtk/3dvideo/mviewwidget.c
index b74409c..cf77140 100644 (file)
--- a/tests/examples/gl/gtk/3dvideo/mviewwidget.c
+++ b/tests/examples/gl/gtk/3dvideo/mviewwidget.c
@@ -77,7 +77,7 @@ gst_mview_widget_class_init (GstMViewWidgetClass * klass)
       g_param_spec_enum ("downmix-mode",
           "Mode for mono downmixed output",
           "Output anaglyph type to generate when downmixing to mono",
-          GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, DEFAULT_DOWNMIX,
+          GST_TYPE_GL_STEREO_DOWNMIX, DEFAULT_DOWNMIX,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
@@ -159,8 +159,7 @@ sync_downmix (GstMViewWidget * mv)
 {
   mv->synching = TRUE;
   gtk_combo_box_set_active_id (GTK_COMBO_BOX (mv->downmix_combo),
-      enum_value_to_nick (GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE,
-          mv->downmix_mode));
+      enum_value_to_nick (GST_TYPE_GL_STEREO_DOWNMIX, mv->downmix_mode));
   mv->synching = FALSE;
 }
 
@@ -235,8 +234,7 @@ gst_mview_widget_constructed (GObject * o)
   gtk_grid_attach (g, w, 2, 1, 1, 1);
 
   if (mv->is_output) {
-    mv->downmix_combo = w =
-        combo_box_from_enum (GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE);
+    mv->downmix_combo = w = combo_box_from_enum (GST_TYPE_GL_STEREO_DOWNMIX);
     gtk_grid_attach (g, w, 1, 2, 3, 1);
     sync_downmix (mv);
     g_signal_connect (G_OBJECT (w), "changed",