mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Rename GST_TYPE_GL_STEREO_DOWNMIX GType macro everywhere

Browse source 
The old one still exists but behind GST_DISABLE_DEPRECATED
This commit is contained in:
Sebastian Dröge 2018-10-03 14:49:32 +03:00
parent 2b4dfb9941
commit c5b78fdc93
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/gst-plugins-base-libs-sections.txt
View file

@ -4533,7 +4533,7 @@ gst_gl_view_convert_perform
gst_gl_view_convert_reset gst_gl_view_convert_reset
gst_gl_view_convert_set_context gst_gl_view_convert_set_context
<SUBSECTION Standard> <SUBSECTION Standard>
GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE GST_TYPE_GL_STEREO_DOWNMIX
gst_gl_stereo_downmix_mode_get_type gst_gl_stereo_downmix_mode_get_type
GST_IS_GL_VIEW_CONVERT GST_IS_GL_VIEW_CONVERT
GST_IS_GL_VIEW_CONVERT_CLASS GST_IS_GL_VIEW_CONVERT_CLASS

4
ext/gl/gstglimagesink.c
View file

@ -283,7 +283,7 @@ gst_gl_image_sink_bin_class_init (GstGLImageSinkBinClass * klass)
g_param_spec_enum ("output-multiview-downmix-mode", g_param_spec_enum ("output-multiview-downmix-mode",
"Mode for mono downmixed output", "Mode for mono downmixed output",
"Output anaglyph type to generate when downmixing to mono", "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)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_video_overlay_install_properties (gobject_class, PROP_BIN_LAST); 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", g_param_spec_enum ("output-multiview-downmix-mode",
"Mode for mono downmixed output", "Mode for mono downmixed output",
"Output anaglyph type to generate when downmixing to mono", "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)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_video_overlay_install_properties (gobject_class, PROP_LAST); gst_video_overlay_install_properties (gobject_class, PROP_LAST);

2
ext/gl/gstglstereomix.c
View file

@ -176,7 +176,7 @@ gst_gl_stereo_mix_class_init (GstGLStereoMixClass * klass)
g_object_class_install_property (gobject_class, PROP_DOWNMIX_MODE, g_object_class_install_property (gobject_class, PROP_DOWNMIX_MODE,
g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output", g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output",
"Output anaglyph type to generate when downmixing to mono", "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)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_add_static_pad_template_with_gtype (element_class, gst_element_class_add_static_pad_template_with_gtype (element_class,

2
ext/gl/gstglviewconvert.c
View file

@ -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_object_class_install_property (gobject_class, PROP_OUTPUT_DOWNMIX_MODE,
g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output", g_param_spec_enum ("downmix-mode", "Mode for mono downmixed output",
"Output anaglyph type to generate when downmixing to mono", "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)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }

8
tests/examples/gl/gtk/3dvideo/mviewwidget.c
View file

@ -77,7 +77,7 @@ gst_mview_widget_class_init (GstMViewWidgetClass * klass)
g_param_spec_enum ("downmix-mode", g_param_spec_enum ("downmix-mode",
"Mode for mono downmixed output", "Mode for mono downmixed output",
"Output anaglyph type to generate when downmixing to mono", "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)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
@ -159,8 +159,7 @@ sync_downmix (GstMViewWidget * mv)
{ {
mv->synching = TRUE; mv->synching = TRUE;
gtk_combo_box_set_active_id (GTK_COMBO_BOX (mv->downmix_combo), gtk_combo_box_set_active_id (GTK_COMBO_BOX (mv->downmix_combo),
enum_value_to_nick (GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE, enum_value_to_nick (GST_TYPE_GL_STEREO_DOWNMIX, mv->downmix_mode));
mv->downmix_mode));
mv->synching = FALSE; mv->synching = FALSE;
} }
@ -235,8 +234,7 @@ gst_mview_widget_constructed (GObject * o)
gtk_grid_attach (g, w, 2, 1, 1, 1); gtk_grid_attach (g, w, 2, 1, 1, 1);
if (mv->is_output) { if (mv->is_output) {
mv->downmix_combo = w = mv->downmix_combo = w = combo_box_from_enum (GST_TYPE_GL_STEREO_DOWNMIX);
combo_box_from_enum (GST_TYPE_GL_STEREO_DOWNMIX_MODE_TYPE);
gtk_grid_attach (g, w, 1, 2, 3, 1); gtk_grid_attach (g, w, 1, 2, 3, 1);
sync_downmix (mv); sync_downmix (mv);
g_signal_connect (G_OBJECT (w), "changed", g_signal_connect (G_OBJECT (w), "changed",