From f972dbb746a7b16877c2026fbdd6343aa326e7bb Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 15 Dec 2001 01:01:57 +0000 Subject: [PATCH] fix some of uraeus's commenting fixes can someone also put {} around GST_DEBUG statements after if's ? Original commit message from CVS: fix some of uraeus's commenting fixes can someone also put {} around GST_DEBUG statements after if's ? --- gst/gstelement.c | 6 ++++-- gst/gstinfo.c | 1 + gst/gstparse.c | 3 +-- gst/gstplugin.c | 6 +++--- gst/gstthread.c | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gst/gstelement.c b/gst/gstelement.c index 90cc323b25..6d3d4e1c80 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -1015,7 +1015,8 @@ gst_element_save_thyself (GstObject *object, { GList *pads; GstElementClass *oclass; -/* GType type; */ + /* FIXME : this is needed for glib2 */ + /* GType type; */ GstElement *element; g_return_val_if_fail (GST_IS_ELEMENT (object), parent); @@ -1038,6 +1039,7 @@ gst_element_save_thyself (GstObject *object, /* FIXME FIXME FIXME! */ /* output all args to the element */ + /* type = G_OBJECT_TYPE (element); while (type != G_TYPE_INVALID) { GtkArg *args; @@ -1062,7 +1064,7 @@ gst_element_save_thyself (GstObject *object, xmlNewChild (arg, NULL, "value", g_strdup_printf ("%d", G_VALUE_UCHAR (args[i]))); break; - case G_TYPE_BOOL: + case G_TYPE_BOOLEAN: xmlNewChild (arg, NULL, "value", G_VALUE_BOOL (args[i]) ? "true" : "false"); break; diff --git a/gst/gstinfo.c b/gst/gstinfo.c index ab9d6ab6bc..dbedb0e778 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c @@ -317,6 +317,7 @@ gst_default_info_handler (gint category, gboolean incore, fprintf(stderr,"INFO:%s%s %s\n", location,elementname,string); #endif /* GST_DEBUG_COLOR */ +/* #endif */ diff --git a/gst/gstparse.c b/gst/gstparse.c index 83caeea64a..e5131e82a7 100644 --- a/gst/gstparse.c +++ b/gst/gstparse.c @@ -342,8 +342,7 @@ gst_parse_launch_cmdline (int argc, char *argv[], GstBin * parent, gst_parse_pri numsinkpads = 0; tempname = NULL; - / - find sink pads + /* find sink pads */ if (sinkpadname != NULL) { while (1) { /* split name at commas */ diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 7bc973711c..675949a4d4 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -97,12 +97,12 @@ _gst_plugin_initialize (void) !doc->xmlRootNode || doc->xmlRootNode->name == 0 || strcmp (doc->xmlRootNode->name, "GST-PluginRegistry") || - !plugin_times_older_than(get_time(GST_CONFIG_DIR"/reg.xml"))) { + !plugin_times_older_than(get_time(GST_CONFIG_DIR"/reg.xml"))) + { if (_gst_warn_old_registry) g_error ("gstplugin: registry needs rebuild: run gstreamer-register\n"); gst_plugin_load_all (); - / -gst_plugin_unload_all (); + gst_plugin_unload_all (); return; } gst_plugin_load_thyself (doc->xmlRootNode); diff --git a/gst/gstthread.c b/gst/gstthread.c index 9806020195..8c91a63953 100644 --- a/gst/gstthread.c +++ b/gst/gstthread.c @@ -324,7 +324,7 @@ gst_thread_change_state (GstElement * element) THR_DEBUG (" element \"%s\"\n", GST_ELEMENT_NAME (e)); elements = g_list_next (elements); if (GST_IS_QUEUE (e)) { - /* FIXME make this more efficient by only waking queues that are asleep */ + /* FIXME make this more efficient by only waking queues that are asleep * FIXME and only waking the appropriate condition (depending on if it's * FIXME on up- or down-stream side) * FIXME also make this more efficient by keeping list of managed queues