diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-10-15 11:19:36 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-10-15 11:19:36 +0000 |
| commit | 68ba3b43848b407960e29d42b69e7d9fff8a7536 (patch) | |
| tree | 8805ca02b8a26bd35af2b2230709436abcb60b04 /gst/gststructure.c | |
| parent | de997d56cc069d1adc5680595e0383f8ab28c0cf (diff) | |
gst/: Add some more comments and debug output. Quote structure name to fix deserialisation of some strings.
Original commit message from CVS:
* gst/gststructure.c:
* gst/gstvalue.c:
Add some more comments and debug output. Quote structure name to fix
deserialisation of some strings.
Diffstat (limited to 'gst/gststructure.c')
| -rw-r--r-- | gst/gststructure.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gst/gststructure.c b/gst/gststructure.c index cc7324769..c95845f4a 100644 --- a/gst/gststructure.c +++ b/gst/gststructure.c @@ -1464,6 +1464,7 @@ gst_structure_value_get_generic_type (GValue * val) return G_VALUE_TYPE (val); } +/* keep in sync with gstvalue.c */ #define GST_ASCII_IS_STRING(c) (g_ascii_isalnum((c)) || ((c) == '_') || \ ((c) == '-') || ((c) == '+') || ((c) == '/') || ((c) == ':') || \ ((c) == '.')) @@ -1494,7 +1495,7 @@ gst_structure_to_string (const GstStructure * structure) s = g_string_new (""); /* FIXME this string may need to be escaped */ - g_string_append_printf (s, "%s", g_quark_to_string (structure->name)); + g_string_append_printf (s, "\"%s\"", g_quark_to_string (structure->name)); for (i = 0; i < structure->fields->len; i++) { char *t; GType type; @@ -1566,7 +1567,6 @@ gst_structure_parse_range (gchar * s, gchar ** after, GValue * value, GType range_type; gboolean ret; - if (*s != '[') return FALSE; s++; @@ -1861,13 +1861,18 @@ gst_structure_from_string (const gchar * string, gchar ** end) r = copy; name = r; - if (!gst_structure_parse_string (r, &w, &r)) + if (!gst_structure_parse_string (r, &w, &r)) { + GST_WARNING ("Failed to parse structure string"); goto error; + } + /* skip spaces */ while (g_ascii_isspace (*r) || (r[0] == '\\' && g_ascii_isspace (r[1]))) r++; - if (*r != 0 && *r != ';' && *r != ',') + if (*r != 0 && *r != ';' && *r != ',') { + GST_WARNING ("Failed to find delimiter, r=%s", r); goto error; + } save = *w; *w = 0; @@ -1875,8 +1880,10 @@ gst_structure_from_string (const gchar * string, gchar ** end) *w = save; while (*r && (*r != ';')) { - if (*r != ',') + if (*r != ',') { + GST_WARNING ("Failed to find delimiter, r=%s", r); goto error; + } r++; while (*r && (g_ascii_isspace (*r) || (r[0] == '\\' && g_ascii_isspace (r[1])))) |