diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2018-10-03 14:49:32 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2018-10-03 14:49:32 +0300 |
commit | c5b78fdc9326bce723f4d56edade1cfff8c61fb5 (patch) | |
tree | ae313f56480b5d72dcf08832afdd9e99ab2f5ce0 | |
parent | 2b4dfb994124b205b9e451f64c62731fb9298dc2 (diff) | |
download | gst-plugins-base-c5b78fdc9326bce723f4d56edade1cfff8c61fb5.tar.gz gst-plugins-base-c5b78fdc9326bce723f4d56edade1cfff8c61fb5.tar.xz |
gl: Rename GST_TYPE_GL_STEREO_DOWNMIX GType macro everywhere
The old one still exists but behind GST_DISABLE_DEPRECATED
-rw-r--r-- | docs/libs/gst-plugins-base-libs-sections.txt | 2 | ||||
-rw-r--r-- | ext/gl/gstglimagesink.c | 4 | ||||
-rw-r--r-- | ext/gl/gstglstereomix.c | 2 | ||||
-rw-r--r-- | ext/gl/gstglviewconvert.c | 2 | ||||
-rw-r--r-- | tests/examples/gl/gtk/3dvideo/mviewwidget.c | 8 |
5 files changed, 8 insertions, 10 deletions
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index ba6cdd39e..5256114ff 100644 --- 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 43653bbe5..860bcfdb2 100644 --- 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 42020a2b0..69760c8cf 100644 --- 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 203df6b97..86cacd651 100644 --- 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 b74409c13..cf771404d 100644 --- 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", |