From df480f353020ce4ad29c8040badd085317b1ab09 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 19 Oct 2010 18:00:33 +0300 Subject: [PATCH] [462/906] various: add missing G_PARAM_STATIC_STRINGS flags Canonicalize property names as needed. Includes some gst-indent changes as well :/ --- gst-libs/gst/gl/gstglfilter.c | 4 ++-- gst-libs/gst/gl/gstglshader.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index bec8cbc..66f2fc1 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -115,10 +115,10 @@ gst_gl_filter_class_init (GstGLFilterClass * klass) gst_gl_filter_prepare_output_buffer; g_object_class_install_property (gobject_class, PROP_EXTERNAL_OPENGL_CONTEXT, - g_param_spec_ulong ("external_opengl_context", + g_param_spec_ulong ("external-opengl-context", "External OpenGL context", "Give an external OpenGL context with which to share textures", - 0, G_MAXULONG, 0, G_PARAM_WRITABLE)); + 0, G_MAXULONG, 0, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); klass->set_caps = NULL; klass->filter = NULL; diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index 0e12e28..c2aadd7 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -162,21 +162,25 @@ gst_gl_shader_class_init (GstGLShaderClass * klass) PROP_VERTEX_SRC, g_param_spec_string ("vertex-src", "Vertex Source", - "GLSL Vertex Shader source code", NULL, G_PARAM_READWRITE)); + "GLSL Vertex Shader source code", NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (obj_class, PROP_FRAGMENT_SRC, g_param_spec_string ("fragment-src", "Fragment Source", - "GLSL Fragment Shader source code", NULL, G_PARAM_READWRITE)); + "GLSL Fragment Shader source code", NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (obj_class, PROP_ACTIVE, g_param_spec_string ("active", - "Active", "Enable/Disable the shader", NULL, G_PARAM_READWRITE)); + "Active", "Enable/Disable the shader", NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (obj_class, PROP_COMPILED, g_param_spec_boolean ("compiled", "Compiled", - "Shader compile and link status", FALSE, G_PARAM_READABLE)); + "Shader compile and link status", FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } void @@ -516,7 +520,7 @@ gst_gl_shader_set_uniform_1i (GstGLShader * shader, const gchar * name, void gst_gl_shader_set_uniform_matrix_4fv (GstGLShader * shader, const gchar * name, - GLsizei count, GLboolean transpose, const GLfloat* value) + GLsizei count, GLboolean transpose, const GLfloat * value) { GstGLShaderPrivate *priv; GLint location = -1; @@ -543,7 +547,8 @@ gst_gl_shader_get_attribute_location (GstGLShader * shader, const gchar * name) } void -gst_gl_shader_bind_attribute_location (GstGLShader * shader, GLuint index, const gchar * name) +gst_gl_shader_bind_attribute_location (GstGLShader * shader, GLuint index, + const gchar * name) { GstGLShaderPrivate *priv; -- 2.7.4