From 5b29f0a1cc8cc69d4176113eb93a1a0fda3c71a2 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 31 Oct 2008 14:24:49 +0000 Subject: [PATCH] gst/gstpreset.c: Use g_unlink instead of unlink. Original commit message from CVS: * gst/gstpreset.c: Use g_unlink instead of unlink. * gst/gststructure.c: Use glib type. * gst/gstutils.c: Add a FIXME:. * gst/gsttaglist.c: * gst/gsttypefind.c: * gst/gstvalue.c: Formatting & whitespaces. --- ChangeLog | 16 ++++++++++++++++ gst/gstpreset.c | 2 +- gst/gststructure.c | 2 +- gst/gsttaglist.c | 3 --- gst/gsttypefind.c | 5 +++-- gst/gstutils.c | 1 + gst/gstvalue.c | 4 ++-- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f0a1e5d71..8c665a151b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-10-31 Stefan Kost + + * gst/gstpreset.c: + Use g_unlink instead of unlink. + + * gst/gststructure.c: + Use glib type. + + * gst/gstutils.c: + Add a FIXME:. + + * gst/gsttaglist.c: + * gst/gsttypefind.c: + * gst/gstvalue.c: + Formatting & whitespaces. + 2008-10-31 Stefan Kost * plugins/elements/gstidentity.c: diff --git a/gst/gstpreset.c b/gst/gstpreset.c index 8ddef4ab43..31e195c972 100644 --- a/gst/gstpreset.c +++ b/gst/gstpreset.c @@ -620,7 +620,7 @@ no_presets: GST_WARNING_OBJECT (preset, "no presets, trying to unlink possibly existing preset file: '%s'", preset_path); - unlink (preset_path); + g_unlink (preset_path); return FALSE; } convert_failed: diff --git a/gst/gststructure.c b/gst/gststructure.c index 6939fb452a..64501eed73 100644 --- a/gst/gststructure.c +++ b/gst/gststructure.c @@ -1374,7 +1374,7 @@ gst_structure_get_fraction (const GstStructure * structure, typedef struct _GstStructureAbbreviation { - char *type_name; + gchar *type_name; GType type; } GstStructureAbbreviation; diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index cb65d7d1f1..a3d3b6512c 100644 --- a/gst/gsttaglist.c +++ b/gst/gsttaglist.c @@ -811,9 +811,7 @@ gst_tag_list_add_valist (GstTagList * list, GstTagMergeMode mode, const gchar * tag, va_list var_args) { GstTagInfo *info; - GQuark quark; - gchar *error = NULL; g_return_if_fail (GST_IS_TAG_LIST (list)); @@ -858,7 +856,6 @@ gst_tag_list_add_valist_values (GstTagList * list, GstTagMergeMode mode, const gchar * tag, va_list var_args) { GstTagInfo *info; - GQuark quark; g_return_if_fail (GST_IS_TAG_LIST (list)); diff --git a/gst/gsttypefind.c b/gst/gsttypefind.c index 683ccc98cb..f4e6aa7856 100644 --- a/gst/gsttypefind.c +++ b/gst/gsttypefind.c @@ -85,13 +85,14 @@ gst_type_find_register (GstPlugin * plugin, const gchar * name, guint rank, factory = g_object_new (GST_TYPE_TYPE_FIND_FACTORY, NULL); GST_DEBUG_OBJECT (factory, "using new typefind factory for %s", name); g_assert (GST_IS_TYPE_FIND_FACTORY (factory)); - gst_plugin_feature_set_name (GST_PLUGIN_FEATURE (factory), name); + gst_plugin_feature_set_name (GST_PLUGIN_FEATURE (factory), name); gst_plugin_feature_set_rank (GST_PLUGIN_FEATURE (factory), rank); + if (factory->extensions) g_strfreev (factory->extensions); - factory->extensions = g_strdupv (extensions); + gst_caps_replace (&factory->caps, (GstCaps *) possible_caps); factory->function = func; factory->user_data = data; diff --git a/gst/gstutils.c b/gst/gstutils.c index ec8fc44c11..b17841d2fd 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -965,6 +965,7 @@ gst_element_get_compatible_pad (GstElement * element, GstPad * pad, /* try to create a new one */ /* requesting is a little crazy, we need a template. Let's create one */ + /* FIXME: why not gst_pad_get_pad_template (pad); */ templcaps = gst_pad_get_caps (pad); templ = gst_pad_template_new ((gchar *) GST_PAD_NAME (pad), diff --git a/gst/gstvalue.c b/gst/gstvalue.c index 18f264fa6f..a2809e9f38 100644 --- a/gst/gstvalue.c +++ b/gst/gstvalue.c @@ -2346,8 +2346,8 @@ gst_value_intersect_fraction_fraction_range (GValue * dest, const GValue * src1, } static gboolean - gst_value_intersect_fraction_range_fraction_range - (GValue * dest, const GValue * src1, const GValue * src2) +gst_value_intersect_fraction_range_fraction_range (GValue * dest, + const GValue * src1, const GValue * src2) { GValue *min; GValue *max;