diff options
author | Andy Wingo <wingo@pobox.com> | 2002-01-10 01:17:29 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2002-01-10 01:17:29 +0000 |
commit | 4a1a06de3e8b5a1cfb3e417836aacac3c3aff110 (patch) | |
tree | 89802ed6d761823b1439902aa657250401683efd | |
parent | 9abde83a8e8532aaf2a5611f2b90dbfe4bdaba8e (diff) | |
download | gst-plugins-bad-4a1a06de3e8b5a1cfb3e417836aacac3c3aff110.tar.gz gst-plugins-bad-4a1a06de3e8b5a1cfb3e417836aacac3c3aff110.tar.bz2 gst-plugins-bad-4a1a06de3e8b5a1cfb3e417836aacac3c3aff110.zip |
fix glib2's complaining on the params of some plugins there's still some work to be done: s/-$//g; && s/\(.*$//;
Original commit message from CVS:
fix glib2's complaining on the params of some plugins
there's still some work to be done: s/-$//g; && s/\(.*$//;
-rw-r--r-- | ext/ladspa/gstladspa.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index e605ec34..b83f0268 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -119,7 +119,7 @@ gst_ladspa_class_init (GstLADSPAClass *klass) gint hintdesc; gint argtype,argperms; GParamSpec *paramspec = NULL; - gchar *argname; + gchar *argname, *tempstr; gobject_class = (GObjectClass*)klass; gstelement_class = (GstElementClass*)klass; @@ -254,10 +254,16 @@ gst_ladspa_class_init (GstLADSPAClass *klass) klass->control_info[i].name = g_strdup(desc->PortNames[current_portnum]); argname = g_strdup(klass->control_info[i].name); - // this is the same thing that param_spec_* will do + /* this is the same thing that param_spec_* will do */ g_strcanon (argname, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-'); + /* satisfy glib2 (argname[0] must be [A-Za-z]) */ + if (!((argname[0] >= 'a' && argname[0] <= 'z') || (argname[0] >= 'A' && argname[0] <= 'Z'))) { + tempstr = argname; + argname = g_strconcat("param-", argname, NULL); + g_free (tempstr); + } - // check for duplicate property names + /* check for duplicate property names */ if (g_object_class_find_property(G_OBJECT_CLASS(klass), argname) != NULL){ gint numarg=1; gchar *numargname = g_strdup_printf("%s_%d",argname,numarg++); @@ -268,6 +274,8 @@ gst_ladspa_class_init (GstLADSPAClass *klass) argname = numargname; } + g_print("adding arg %s from %s\n",argname, klass->control_info[i].name); + if (argtype==G_TYPE_BOOLEAN){ paramspec = g_param_spec_boolean(argname,argname,argname, FALSE, argperms); } else if (argtype==G_TYPE_INT){ @@ -278,9 +286,8 @@ gst_ladspa_class_init (GstLADSPAClass *klass) klass->control_info[i].lowerbound, klass->control_info[i].upperbound, (klass->control_info[i].lowerbound + klass->control_info[i].upperbound) / 2.0f, argperms); } - g_object_class_install_property(G_OBJECT_CLASS(klass), i+ARG_LAST, paramspec); - g_print("added arg %s from %s\n",argname, klass->control_info[i].name); + g_object_class_install_property(G_OBJECT_CLASS(klass), i+ARG_LAST, paramspec); } } |