From: <tp...@ke...> - 2006-06-13 13:31:01
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Tue Jun 13 2006 13:30:59 UTC Log message: * gst/gstregistryxml.c: (gst_registry_xml_write_cache): Fix silly bug that prevented us from creating ~/.gstreamer-0.10 and writing the registry in one go (the first call to g_mkstemp() would overwrite the placeholder in the template string, so the second call to g_mkstemp() after creating the missing directory would then error out with 'invalid argument'). Modified files: . : ChangeLog gst : gstregistryxml.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2600&r2=1.2601 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstregistryxml.c.diff?r1=1.26&r2=1.27 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2600 retrieving revision 1.2601 diff -u -d -r1.2600 -r1.2601 --- ChangeLog 13 Jun 2006 11:17:01 -0000 1.2600 +++ ChangeLog 13 Jun 2006 13:30:46 -0000 1.2601 @@ -1,3 +1,13 @@ +2006-06-13 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstregistryxml.c: (gst_registry_xml_write_cache): + Fix silly bug that prevented us from creating + ~/.gstreamer-0.10 and writing the registry in one + go (the first call to g_mkstemp() would overwrite the + placeholder in the template string, so the second call + to g_mkstemp() after creating the missing directory + would then error out with 'invalid argument'). 2006-06-13 Edward Hervey <ed...@fl...> * gst/gst.c: (init_post): Index: gstregistryxml.c RCS file: /cvs/gstreamer/gstreamer/gst/gstregistryxml.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- gstregistryxml.c 12 Jun 2006 09:17:44 -0000 1.26 +++ gstregistryxml.c 13 Jun 2006 13:30:46 -0000 1.27 @@ -840,11 +840,16 @@ g_mkdir_with_parents (dir, 0777); g_free (dir); - registry->cache_file = g_mkstemp (tmp_location); - } - if (registry->cache_file == -1) { + /* the previous g_mkstemp call overwrote the XXXXXX placeholder ... */ g_free (tmp_location); - return FALSE; + tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL); + registry->cache_file = g_mkstemp (tmp_location); + if (registry->cache_file == -1) { + GST_DEBUG ("g_mkstemp() failed: %s", g_strerror (errno)); + g_free (tmp_location); + return FALSE; + } } if (!gst_registry_save (registry, "<?xml version=\"1.0\"?>\n")) |
From: <tp...@ke...> - 2006-06-13 16:41:53
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Tue Jun 13 2006 16:41:49 UTC Log message: * gst/gst.c: (scan_and_update_registry), (init_post): If the fork()'ed child process can't write the updated registry cache file to disk for some reason, make it exit with a failure exit code, so that the parent can then re-scan the plugins itself and update the registry structures in memory and work with that (rather than failing when creating elements because seemingly no plugins are available). Refactor registry scanning code into separate function for this and also separate fork() and non-fork() code paths. Fixes #344748. Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2602&r2=1.2603 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.209&r2=1.210 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2602 retrieving revision 1.2603 diff -u -d -r1.2602 -r1.2603 --- ChangeLog 13 Jun 2006 16:24:43 -0000 1.2602 +++ ChangeLog 13 Jun 2006 16:41:37 -0000 1.2603 @@ -1,3 +1,14 @@ +2006-06-13 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gst.c: (scan_and_update_registry), (init_post): + If the fork()'ed child process can't write the updated registry cache + file to disk for some reason, make it exit with a failure exit code, + so that the parent can then re-scan the plugins itself and update the + registry structures in memory and work with that (rather than failing + when creating elements because seemingly no plugins are available). + Refactor registry scanning code into separate function for this and + also separate fork() and non-fork() code paths. Fixes #344748. 2006-06-13 Wim Taymans <wi...@fl...> * docs/manual/advanced-dataaccess.xml: Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -r1.209 -r1.210 --- gst.c 13 Jun 2006 11:17:02 -0000 1.209 +++ gst.c 13 Jun 2006 16:41:37 -0000 1.210 @@ -543,6 +543,100 @@ GST_PADDING_INIT }; +#ifndef GST_DISABLE_REGISTRY +static gboolean +scan_and_update_registry (GstRegistry * default_registry, + const gchar * registry_file, gboolean write_changes) +{ + const gchar *plugin_path; + gboolean changed = FALSE; + GList *l; + GST_DEBUG ("reading registry cache: %s", registry_file); + gst_registry_xml_read_cache (default_registry, registry_file); + /* scan paths specified via --gst-plugin-path */ + GST_DEBUG ("scanning paths added via --gst-plugin-path"); + for (l = plugin_paths; l != NULL; l = l->next) { + GST_INFO ("Scanning plugin path: \"%s\"", (gchar *) l->data); + /* CHECKME: add changed |= here as well? */ + gst_registry_scan_path (default_registry, (gchar *) l->data); + g_free (l->data); + } + g_list_free (plugin_paths); + plugin_paths = NULL; + /* GST_PLUGIN_PATH specifies a list of directories to scan for + * additional plugins. These take precedence over the system plugins */ + plugin_path = g_getenv ("GST_PLUGIN_PATH"); + if (plugin_path) { + char **list; + int i; + GST_DEBUG ("GST_PLUGIN_PATH set to %s", plugin_path); + list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0); + for (i = 0; list[i]; i++) { + changed |= gst_registry_scan_path (default_registry, list[i]); + } + g_strfreev (list); + } else { + GST_DEBUG ("GST_PLUGIN_PATH not set"); + /* GST_PLUGIN_SYSTEM_PATH specifies a list of plugins that are always + * loaded by default. If not set, this defaults to the system-installed + * path, and the plugins installed in the user's home directory */ + plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH"); + if (plugin_path == NULL) { + char *home_plugins; + GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set"); + /* plugins in the user's home directory take precedence over + * system-installed ones */ + home_plugins = g_build_filename (g_get_home_dir (), + ".gstreamer-" GST_MAJORMINOR, "plugins", NULL); + changed |= gst_registry_scan_path (default_registry, home_plugins); + g_free (home_plugins); + /* add the main (installed) library path */ + changed |= gst_registry_scan_path (default_registry, PLUGINDIR); + gchar **list; + gint i; + GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH set to %s", plugin_path); + if (!changed) { + GST_DEBUG ("registry cache has not changed"); + return TRUE; + if (!write_changes) { + GST_DEBUG ("not trying to write registry cache changes to file"); + GST_DEBUG ("writing registry cache"); + if (!gst_registry_xml_write_cache (default_registry, registry_file)) { + g_warning ("Problem writing registry cache to %s: %s", registry_file, + g_strerror (errno)); + return FALSE; + GST_DEBUG ("registry cache written successfully"); + return TRUE; +} +#endif /* GST_DISABLE_REGISTRY */ /* * this bit handles: * - initalization of threads if we use them @@ -598,24 +692,12 @@ #ifndef GST_DISABLE_REGISTRY { char *registry_file; - const char *plugin_path; GstRegistry *default_registry; - gboolean changed = FALSE; - GList *l; #ifdef HAVE_FORK pid_t pid; #endif - for (l = plugin_paths; l != NULL; l = l->next) { - GST_INFO ("Scanning plugin path: \"%s\"", (gchar *) l->data); - /* CHECKME: add changed |= here as well? */ - gst_registry_scan_path (gst_registry_get_default (), (gchar *) l->data); - g_free (l->data); - } - g_list_free (plugin_paths); - plugin_paths = NULL; - default_registry = gst_registry_get_default (); registry_file = g_strdup (g_getenv ("GST_REGISTRY")); if (registry_file == NULL) { @@ -635,71 +717,18 @@ } if (pid == 0) { - /* this is the child */ -#endif /* HAVE_FORK */ + gboolean res; + /* this is the child */ GST_DEBUG ("child reading registry cache"); - gst_registry_xml_read_cache (default_registry, registry_file); - /* GST_PLUGIN_PATH specifies a list of directories to scan for - * additional plugins. These take precedence over the system plugins */ - plugin_path = g_getenv ("GST_PLUGIN_PATH"); - if (plugin_path) { - char **list; - int i; - GST_DEBUG ("GST_PLUGIN_PATH set to %s", plugin_path); - list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0); - for (i = 0; list[i]; i++) { - changed |= gst_registry_scan_path (default_registry, list[i]); - } - g_strfreev (list); - } else { - GST_DEBUG ("GST_PLUGIN_PATH not set"); - } - /* GST_PLUGIN_SYSTEM_PATH specifies a list of plugins that are always - * loaded by default. If not set, this defaults to the system-installed - * path, and the plugins installed in the user's home directory */ - plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH"); - if (plugin_path == NULL) { - char *home_plugins; - GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set"); - /* plugins in the user's home directory take precedence over - * system-installed ones */ - home_plugins = g_build_filename (g_get_home_dir (), - ".gstreamer-" GST_MAJORMINOR, "plugins", NULL); - changed |= gst_registry_scan_path (default_registry, home_plugins); - g_free (home_plugins); - /* add the main (installed) library path */ - changed |= gst_registry_scan_path (default_registry, PLUGINDIR); - GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH set to %s", plugin_path); - if (changed) { - GST_DEBUG ("writing registry cache"); - gst_registry_xml_write_cache (default_registry, registry_file); + res = scan_and_update_registry (default_registry, registry_file, TRUE); _gst_registry_remove_cache_plugins (default_registry); -#ifdef HAVE_FORK g_free (registry_file); /* need to use _exit, so that any exit handlers registered don't * bring down the main program */ - _exit (0); + GST_DEBUG ("child exiting: %s", (res) ? "SUCCESS" : "FAILURE"); + _exit ((res) ? EXIT_SUCCESS : EXIT_FAILURE); } else { /* parent */ int status; @@ -720,9 +749,22 @@ GST_DEBUG ("child exited normally with return value %d", WEXITSTATUS (status)); - GST_DEBUG ("parent reading registry cache"); + if (WEXITSTATUS (status) == EXIT_SUCCESS) { + GST_DEBUG ("parent reading registry cache"); + gst_registry_xml_read_cache (default_registry, registry_file); + } else { + GST_DEBUG ("parent re-scanning registry"); + scan_and_update_registry (default_registry, registry_file, FALSE); + } +#else /* HAVE_FORK */ + /* fork() not available */ + GST_DEBUG ("updating registry cache"); + scan_and_update_registry (default_registry, registry_file, TRUE); #endif /* HAVE_FORK */ g_free (registry_file); |
From: <tp...@ke...> - 2006-06-21 10:02:11
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Wed Jun 21 2006 10:02:10 UTC Log message: * gst/gstbus.c: (gst_bus_class_init): Fix some typos, make docs more explicit. Modified files: . : ChangeLog gst : gstbus.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2612&r2=1.2613 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbus.c.diff?r1=1.58&r2=1.59 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2612 retrieving revision 1.2613 diff -u -d -r1.2612 -r1.2613 --- ChangeLog 20 Jun 2006 08:40:40 -0000 1.2612 +++ ChangeLog 21 Jun 2006 10:01:58 -0000 1.2613 @@ -1,3 +1,8 @@ +2006-06-21 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstbus.c: (gst_bus_class_init): + Fix some typos, make docs more explicit. 2006-06-20 Wim Taymans <wi...@fl...> * tests/check/gst/gstghostpad.c: (block_callback), Index: gstbus.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- gstbus.c 4 May 2006 15:20:14 -0000 1.58 +++ gstbus.c 21 Jun 2006 10:01:58 -0000 1.59 @@ -183,7 +183,7 @@ * @message: the message that has been posted synchronously * * A message has been posted on the bus. This signal is emitted from the - * thread that posted the message so one has to be carefull with locking. + * thread that posted the message so one has to be careful with locking. */ gst_bus_signals[SYNC_MESSAGE] = g_signal_new ("sync-message", G_TYPE_FROM_CLASS (klass), @@ -197,7 +197,7 @@ * @message: the message that has been posted asynchronously * A message has been posted on the bus. This signal is emitted from a - * GSource added to the mainloop. this signal will only be emited when + * GSource added to the mainloop. this signal will only be emitted when * there is a mainloop running. gst_bus_signals[ASYNC_MESSAGE] = @@ -478,6 +478,8 @@ * Get a message from the bus. * * Returns: The #GstMessage that is on the bus, or NULL if the bus is empty. + * The message is taken from the bus and needs to be unreffed with + * gst_message_unref() after usage. * MT safe. */ @@ -826,7 +828,8 @@ * polling. * Returns: The message that was received, or NULL if the poll timed out. - * The message is taken from the bus and needs to be unreffed after usage. GstMessage * gst_bus_poll (GstBus * bus, GstMessageType events, GstClockTimeDiff timeout) |
From: <tp...@ke...> - 2006-06-28 15:19:22
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Wed Jun 28 2006 15:19:20 UTC Log message: Patch by: Peter Kjellerstedt <pkj at axis com> * gst/gst.c: (prepare_for_load_plugin_func), (split_and_iterate): Fix missing g_strdup() and double free when using the --gst-plugin-load command line option (#346097). Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2622&r2=1.2623 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.210&r2=1.211 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2622 retrieving revision 1.2623 diff -u -d -r1.2622 -r1.2623 --- ChangeLog 23 Jun 2006 13:16:46 -0000 1.2622 +++ ChangeLog 28 Jun 2006 15:19:08 -0000 1.2623 @@ -1,3 +1,11 @@ +2006-06-28 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Peter Kjellerstedt <pkj at axis com> + * gst/gst.c: (prepare_for_load_plugin_func), (split_and_iterate): + Fix missing g_strdup() and double free when using the + --gst-plugin-load command line option (#346097). 2006-06-23 Tim-Philipp Müller <tim at centricular dot net> * gst/gstinfo.c: Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.210 retrieving revision 1.211 diff -u -d -r1.210 -r1.211 --- gst.c 13 Jun 2006 16:41:37 -0000 1.210 +++ gst.c 28 Jun 2006 15:19:08 -0000 1.211 @@ -407,7 +407,7 @@ static void prepare_for_load_plugin_func (gpointer data, gpointer user_data) { - preload_plugins = g_slist_prepend (preload_plugins, data); + preload_plugins = g_slist_prepend (preload_plugins, g_strdup (data)); } @@ -455,7 +455,6 @@ iterator (strings[j], user_data); if (++j == MAX_PATH_SPLIT) { lastlist = g_strdup (strings[j]); - g_strfreev (strings); j = 0; break; } |
From: <tp...@ke...> - 2006-06-30 13:19:14
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Jun 30 2006 13:17:58 UTC Log message: * gst/gstbin.c: (gst_bin_restore_thyself): * gst/gstxml.c: (gst_xml_make_element): Fix deserialisation from XML. Set parent manually instead of using gst_bin_add(), since gst_bin_add() will unlink all pads of the element being added. Fixes #341667. Modified files: . : ChangeLog gst : gstbin.c gstxml.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2623&r2=1.2624 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.334&r2=1.335 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstxml.c.diff?r1=1.52&r2=1.53 ====Begin Diffs==== Index: gstbin.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v retrieving revision 1.334 retrieving revision 1.335 diff -u -d -r1.334 -r1.335 --- gstbin.c 14 Jun 2006 10:34:14 -0000 1.334 +++ gstbin.c 30 Jun 2006 13:17:46 -0000 1.335 @@ -2634,15 +2634,8 @@ childlist = field->xmlChildrenNode; while (childlist) { if (!strcmp ((char *) childlist->name, "element")) { - GstElement *element = - gst_xml_make_element (childlist, GST_OBJECT (bin)); - - /* it had to be parented to find the pads, now we ref and unparent so - * we can add it to the bin */ - gst_object_ref (element); - gst_object_unparent (GST_OBJECT (element)); - gst_bin_add (bin, element); + /* gst_xml_make_element will gst_bin_add() the element to ourself */ + gst_xml_make_element (childlist, GST_OBJECT (bin)); } childlist = childlist->next; } Index: gstxml.c RCS file: /cvs/gstreamer/gstreamer/gst/gstxml.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- gstxml.c 12 Jun 2006 08:55:21 -0000 1.52 +++ gstxml.c 30 Jun 2006 13:17:46 -0000 1.53 @@ -450,8 +450,13 @@ /* ne need to set the parent on this object bacause the pads */ /* will go through the hierarchy to link to their peers */ - if (parent) - gst_object_set_parent (GST_OBJECT (element), parent); + if (parent) { + if (GST_IS_BIN (parent)) { + gst_bin_add (GST_BIN (parent), element); + } else { + gst_object_set_parent (GST_OBJECT (element), parent); + } + } gst_object_restore_thyself (GST_OBJECT (element), cur); Index: ChangeLog RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2623 retrieving revision 1.2624 diff -u -d -r1.2623 -r1.2624 --- ChangeLog 28 Jun 2006 15:19:08 -0000 1.2623 +++ ChangeLog 30 Jun 2006 13:17:46 -0000 1.2624 @@ -1,3 +1,12 @@ +2006-06-30 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstbin.c: (gst_bin_restore_thyself): + * gst/gstxml.c: (gst_xml_make_element): + Fix deserialisation from XML. Set parent manually + instead of using gst_bin_add(), since gst_bin_add() + will unlink all pads of the element being added. + Fixes #341667. 2006-06-28 Tim-Philipp Müller <tim at centricular dot net> Patch by: Peter Kjellerstedt <pkj at axis com> |
From: <tp...@ke...> - 2006-07-07 15:42:25
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Jul 07 2006 15:42:20 UTC Log message: * gst/gstbin.c: (compare_interface), (gst_bin_get_by_interface), (gst_bin_iterate_all_by_interface): Can't use GPOINTER_TO_INT and GINT_TO_POINTER with GTypes. GTypes are gulongs and thus the top 4 bytes might be cut off on some platforms when doing GPOINTER_TO_INT, leading to invalid GTypes and bad things happening. Also add a check to make sure the type passed in is really an interface type. Modified files: . : ChangeLog gst : gstbin.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2657&r2=1.2658 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbin.c.diff?r1=1.335&r2=1.336 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2657 retrieving revision 1.2658 diff -u -d -r1.2657 -r1.2658 --- ChangeLog 7 Jul 2006 09:47:19 -0000 1.2657 +++ ChangeLog 7 Jul 2006 15:42:07 -0000 1.2658 @@ -1,5 +1,16 @@ 2006-07-07 Tim-Philipp Müller <tim at centricular dot net> + * gst/gstbin.c: (compare_interface), (gst_bin_get_by_interface), + (gst_bin_iterate_all_by_interface): + Can't use GPOINTER_TO_INT and GINT_TO_POINTER with GTypes. + GTypes are gulongs and thus the top 4 bytes might be cut + off on some platforms when doing GPOINTER_TO_INT, leading + to invalid GTypes and bad things happening. + Also add a check to make sure the type passed in is really + an interface type. + +2006-07-07 Tim-Philipp Müller <tim at centricular dot net> * .cvsignore: Ignore more. Index: gstbin.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v retrieving revision 1.335 retrieving revision 1.336 diff -u -d -r1.335 -r1.336 --- gstbin.c 30 Jun 2006 13:17:46 -0000 1.335 +++ gstbin.c 7 Jul 2006 15:42:08 -0000 1.336 @@ -2516,9 +2516,10 @@ static gint compare_interface (GstElement * element, gpointer interface) { + GType interface_type = (GType) interface; gint ret; - if (G_TYPE_CHECK_INSTANCE_TYPE (element, GPOINTER_TO_INT (interface))) { + if (G_TYPE_CHECK_INSTANCE_TYPE (element, interface_type)) { ret = 0; } else { /* we did not find the element, need to release the ref @@ -2548,13 +2549,14 @@ gst_bin_get_by_interface (GstBin * bin, GType interface) GstIterator *children; - GstIterator *result; + gpointer result; g_return_val_if_fail (GST_IS_BIN (bin), NULL); + g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface), NULL); children = gst_bin_iterate_recurse (bin); result = gst_iterator_find_custom (children, (GCompareFunc) compare_interface, - GINT_TO_POINTER (interface)); + (gpointer) interface); gst_iterator_free (children); return GST_ELEMENT_CAST (result); @@ -2585,10 +2587,11 @@ GstIterator *result; result = gst_iterator_filter (children, (GCompareFunc) compare_interface, return result; } |
From: <tp...@ke...> - 2006-07-20 10:50:36
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Thu Jul 20 2006 10:50:32 UTC Log message: * gst/gstsegment.h: Convert tabs to spaces for better readability. Modified files: . : ChangeLog gst : gstsegment.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2682&r2=1.2683 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstsegment.h.diff?r1=1.7&r2=1.8 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2682 retrieving revision 1.2683 diff -u -d -r1.2682 -r1.2683 --- ChangeLog 20 Jul 2006 10:25:28 -0000 1.2682 +++ ChangeLog 20 Jul 2006 10:50:20 -0000 1.2683 @@ -1,3 +1,8 @@ +2006-07-20 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstsegment.h: + Convert tabs to spaces for better readability. 2006-07-20 Edward Hervey <ed...@fl...> * tests/check/libs/gdp.c: (gst_dp_suite): Index: gstsegment.h RCS file: /cvs/gstreamer/gstreamer/gst/gstsegment.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gstsegment.h 6 Jun 2006 13:11:03 -0000 1.7 +++ gstsegment.h 20 Jul 2006 10:50:20 -0000 1.8 @@ -71,33 +71,33 @@ guint8 _gst_reserved[(sizeof (gpointer) * GST_PADDING) - sizeof (gdouble)]; }; -GType gst_segment_get_type (void); +GType gst_segment_get_type (void); -GstSegment * gst_segment_new (void); -void gst_segment_free (GstSegment *segment); +GstSegment * gst_segment_new (void); +void gst_segment_free (GstSegment *segment); -void gst_segment_init (GstSegment *segment, GstFormat format); +void gst_segment_init (GstSegment *segment, GstFormat format); -void gst_segment_set_duration (GstSegment *segment, GstFormat format, gint64 duration); -void gst_segment_set_last_stop (GstSegment *segment, GstFormat format, gint64 position); +void gst_segment_set_duration (GstSegment *segment, GstFormat format, gint64 duration); +void gst_segment_set_last_stop (GstSegment *segment, GstFormat format, gint64 position); -void gst_segment_set_seek (GstSegment *segment, gdouble rate, - GstFormat format, GstSeekFlags flags, - GstSeekType cur_type, gint64 cur, - GstSeekType stop_type, gint64 stop, - gboolean *update); +void gst_segment_set_seek (GstSegment *segment, gdouble rate, + GstFormat format, GstSeekFlags flags, + GstSeekType cur_type, gint64 cur, + GstSeekType stop_type, gint64 stop, + gboolean *update); -void gst_segment_set_newsegment (GstSegment *segment, gboolean update, gdouble rate, - GstFormat format, gint64 start, gint64 stop, gint64 time); -void gst_segment_set_newsegment_full (GstSegment *segment, gboolean update, gdouble rate, - gdouble applied_rate, GstFormat format, gint64 start, - gint64 stop, gint64 time); +void gst_segment_set_newsegment (GstSegment *segment, gboolean update, gdouble rate, + GstFormat format, gint64 start, gint64 stop, gint64 time); +void gst_segment_set_newsegment_full (GstSegment *segment, gboolean update, gdouble rate, + gdouble applied_rate, GstFormat format, gint64 start, + gint64 stop, gint64 time); -gint64 gst_segment_to_stream_time (GstSegment *segment, GstFormat format, gint64 position); -gint64 gst_segment_to_running_time (GstSegment *segment, GstFormat format, gint64 position); +gint64 gst_segment_to_stream_time (GstSegment *segment, GstFormat format, gint64 position); +gint64 gst_segment_to_running_time (GstSegment *segment, GstFormat format, gint64 position); -gboolean gst_segment_clip (GstSegment *segment, GstFormat format, gint64 start, - gint64 stop, gint64 *clip_start, gint64 *clip_stop); +gboolean gst_segment_clip (GstSegment *segment, GstFormat format, gint64 start, + gint64 stop, gint64 *clip_start, gint64 *clip_stop); G_END_DECLS |
From: <tp...@ke...> - 2006-07-20 16:10:30
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Thu Jul 20 2006 16:10:29 UTC Log message: * gst/gsttaglist.c: Add some more docs, comments and FIXME 0.11s here and there and also fix some typos. Modified files: . : ChangeLog gst : gsttaglist.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2683&r2=1.2684 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsttaglist.c.diff?r1=1.45&r2=1.46 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2683 retrieving revision 1.2684 diff -u -d -r1.2683 -r1.2684 --- ChangeLog 20 Jul 2006 10:50:20 -0000 1.2683 +++ ChangeLog 20 Jul 2006 16:10:17 -0000 1.2684 @@ -1,5 +1,11 @@ 2006-07-20 Tim-Philipp Müller <tim at centricular dot net> + * gst/gsttaglist.c: + Add some more docs, comments and FIXME 0.11s here and there + and also fix some typos. + +2006-07-20 Tim-Philipp Müller <tim at centricular dot net> * gst/gstsegment.h: Convert tabs to spaces for better readability. Index: gsttaglist.c RCS file: /cvs/gstreamer/gstreamer/gst/gsttaglist.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- gsttaglist.c 12 Jun 2006 08:55:21 -0000 1.45 +++ gsttaglist.c 20 Jul 2006 16:10:17 -0000 1.46 @@ -44,6 +44,10 @@ #define GST_TAG_IS_VALID(tag) (gst_tag_get_info (tag) != NULL) +/* FIXME 0.11: use GParamSpecs or something similar for tag registrations, + * possibly even gst_tag_register(). Especially value ranges might be + * useful for some tags. */ typedef struct { GType type; /* type the data is in */ @@ -271,12 +275,29 @@ * @type: the type this data is in * @nick: human-readable name * @blurb: a human-readable description about this tag - * @func: function for merging multiple values of this tag + * @func: function for merging multiple values of this tag, or NULL * * Registers a new tag type for the use with GStreamer's type system. If a type * with that name is already registered, that one is used. * The old registration may have used a different type however. So don't rely * on your supplied values. + * + * Important: if you do not supply a merge function the implication will be + * that there can only be one single value for this tag in a tag list and + * any additional values will silenty be discarded when being added (unless + * #GST_TAG_MERGE_REPLACE, #GST_TAG_MERGE_REPLACE_ALL, or + * #GST_TAG_MERGE_PREPEND is used as merge mode, in which case the new + * value will replace the old one in the list). + * The merge function will be called from gst_tag_list_copy_value() when + * it is required that one or more values for a tag be condensed into + * one single value. This may happen from gst_tag_list_get_string(), + * gst_tag_list_get_int(), gst_tag_list_get_double() etc. What will happen + * exactly in that case depends on how the tag was registered and if a + * merge function was supplied and if so which one. + * Two default merge functions are provided: gst_tag_merge_use_first() and + * gst_tag_merge_strings_with_commas(). */ void gst_tag_register (const gchar * name, GstTagFlag flag, GType type, @@ -771,7 +792,7 @@ * @list: list to remove tag from * @tag: tag to remove - * Removes the goven tag from the taglist. + * Removes the given tag from the taglist. gst_tag_list_remove_tag (GstTagList * list, const gchar * tag) @@ -825,7 +846,7 @@ /** * gst_tag_list_get_value_index: - * @list: a #GStTagList + * @list: a #GstTagList * @tag: tag to read out * @index: number of entry to read out @@ -901,6 +922,15 @@ return TRUE; } +/* FIXME 0.11: this whole merge function business is overdesigned, and the + * _get_foo() API is misleading as well - how many application developers will + * expect gst_tag_list_get_string (list, GST_TAG_ARTIST, &val) might return a + * string with multiple comma-separated artists? _get_foo() should just be + * a convenience wrapper around _get_foo_index (list, tag, 0, &val), + * supplemented by a special _tag_list_get_string_merged() function if needed + * (unless someone can actually think of real use cases where the merge + * function is not 'use first' for non-strings and merge for strings) */ /***** evil macros to get all the gst_tag_list_get_*() functions right *****/ #define TAG_MERGE_FUNCS(name,type) \ @@ -938,10 +968,14 @@ return TRUE; \ +/* FIXME 0.11: maybe get rid of _get_char*(), _get_uchar*(), _get_long*(), + * _get_ulong*() and _get_pointer*()? - they are not really useful/common + * enough to warrant convenience accessor functions */ #define COPY_FUNC /**/ * gst_tag_list_get_char: - * @list: a #GStTagList to get the tag from + * @list: a #GstTagList to get the tag from * @value: location for the result @@ -953,7 +987,7 @@ * gst_tag_list_get_char_index: @@ -967,7 +1001,7 @@ TAG_MERGE_FUNCS (char, gchar) * gst_tag_list_get_uchar: @@ -979,7 +1013,7 @@ * gst_tag_list_get_uchar_index: @@ -993,7 +1027,7 @@ TAG_MERGE_FUNCS (uchar, guchar) * gst_tag_list_get_boolean: @@ -1005,7 +1039,7 @@ * gst_tag_list_get_boolean_index: @@ -1019,7 +1053,7 @@ TAG_MERGE_FUNCS (boolean, gboolean) * gst_tag_list_get_int: @@ -1031,7 +1065,7 @@ * gst_tag_list_get_int_index: @@ -1045,7 +1079,7 @@ TAG_MERGE_FUNCS (int, gint) * gst_tag_list_get_uint: @@ -1057,7 +1091,7 @@ * gst_tag_list_get_uint_index: @@ -1071,7 +1105,7 @@ TAG_MERGE_FUNCS (uint, guint) * gst_tag_list_get_long: @@ -1083,7 +1117,7 @@ * gst_tag_list_get_long_index: @@ -1097,7 +1131,7 @@ TAG_MERGE_FUNCS (long, glong) * gst_tag_list_get_ulong: @@ -1109,7 +1143,7 @@ * gst_tag_list_get_ulong_index: @@ -1123,7 +1157,7 @@ TAG_MERGE_FUNCS (ulong, gulong) * gst_tag_list_get_int64: @@ -1135,7 +1169,7 @@ * gst_tag_list_get_int64_index: @@ -1149,7 +1183,7 @@ TAG_MERGE_FUNCS (int64, gint64) * gst_tag_list_get_uint64: @@ -1161,7 +1195,7 @@ * gst_tag_list_get_uint64_index: @@ -1175,7 +1209,7 @@ TAG_MERGE_FUNCS (uint64, guint64) * gst_tag_list_get_float: @@ -1187,7 +1221,7 @@ * gst_tag_list_get_float_index: @@ -1201,7 +1235,7 @@ TAG_MERGE_FUNCS (float, gfloat) * gst_tag_list_get_double: @@ -1213,7 +1247,7 @@ * gst_tag_list_get_double_index: @@ -1227,7 +1261,7 @@ TAG_MERGE_FUNCS (double, gdouble) * gst_tag_list_get_pointer: @@ -1239,7 +1273,7 @@ * gst_tag_list_get_pointer_index: @@ -1255,12 +1289,15 @@ #define COPY_FUNC g_strdup * gst_tag_list_get_string: - * Copies the contents for the given tag into the value, merging multiple values - * into one if multiple values are associated with the tag. + * Copies the contents for the given tag into the value, possibly merging + * multiple values into one if multiple values are associated with the tag. + * Use gst_tag_list_get_string_index (list, tag, 0, value) if you want + * to retrieve the first string associated with this tag unmodified. * * The resulting string in @value should be freed by the caller using g_free * when no longer needed @@ -1270,7 +1307,7 @@ * gst_tag_list_get_string_index: @@ -1288,7 +1325,7 @@ * gst_tag_list_get_date: @@ -1317,7 +1354,7 @@ * gst_tag_list_get_date_index: |
From: <tp...@ke...> - 2006-07-24 16:33:44
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Jul 24 2006 16:33:43 UTC Log message: * gst/gsttaglist.c: (_gst_tag_initialize): Allow more than one GST_TAG_IMAGE per taglist. Modified files: . : ChangeLog gst : gsttaglist.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2693&r2=1.2694 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsttaglist.c.diff?r1=1.46&r2=1.47 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2693 retrieving revision 1.2694 diff -u -d -r1.2693 -r1.2694 --- ChangeLog 24 Jul 2006 07:40:13 -0000 1.2693 +++ ChangeLog 24 Jul 2006 16:33:30 -0000 1.2694 @@ -1,3 +1,8 @@ +2006-07-24 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gsttaglist.c: (_gst_tag_initialize): + Allow more than one GST_TAG_IMAGE per taglist. 2006-07-24 Thomas Vander Stichele <thomas at apestaart dot org> * gst/gstminiobject.c: Index: gsttaglist.c RCS file: /cvs/gstreamer/gstreamer/gst/gsttaglist.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- gsttaglist.c 20 Jul 2006 16:10:17 -0000 1.46 +++ gsttaglist.c 24 Jul 2006 16:33:31 -0000 1.47 @@ -205,7 +205,7 @@ _("language code"), _("language code for this stream, conforming to ISO-639-1"), NULL); gst_tag_register (GST_TAG_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER, - _("image"), _("image related to this stream"), NULL); + _("image"), _("image related to this stream"), gst_tag_merge_use_first); gst_tag_register (GST_TAG_PREVIEW_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER, _("preview image"), _("preview image related to this stream"), NULL); } |
From: <tp...@ke...> - 2006-08-04 15:15:37
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Aug 04 2006 15:15:36 UTC Log message: * gst/gstelement.c: (gst_element_remove_pad): Don't crash printing the warning if the pad has no parent. Modified files: . : ChangeLog gst : gstelement.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2721&r2=1.2722 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstelement.c.diff?r1=1.435&r2=1.436 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2721 retrieving revision 1.2722 diff -u -d -r1.2721 -r1.2722 --- ChangeLog 2 Aug 2006 15:19:29 -0000 1.2721 +++ ChangeLog 4 Aug 2006 15:15:23 -0000 1.2722 @@ -1,3 +1,8 @@ +2006-08-04 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstelement.c: (gst_element_remove_pad): + Don't crash printing the warning if the pad has no parent. 2006-08-02 Wim Taymans <wi...@fl...> * libs/gst/dataprotocol/dataprotocol.c: Index: gstelement.c RCS file: /cvs/gstreamer/gstreamer/gst/gstelement.c,v retrieving revision 1.435 retrieving revision 1.436 diff -u -d -r1.435 -r1.436 --- gstelement.c 9 Jul 2006 16:56:48 -0000 1.435 +++ gstelement.c 4 Aug 2006 15:15:24 -0000 1.436 @@ -746,8 +746,7 @@ /* FIXME, locking order? */ GST_OBJECT_LOCK (element); g_critical ("Padname %s:%s does not belong to element %s when removing", - GST_ELEMENT_NAME (GST_PAD_PARENT (pad)), GST_PAD_NAME (pad), - GST_ELEMENT_NAME (element)); + GST_DEBUG_PAD_NAME (pad), GST_ELEMENT_NAME (element)); GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (pad); return FALSE; |
From: <tp...@ke...> - 2006-08-11 09:59:44
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Aug 11 2006 09:59:41 UTC Log message: * gst/gst.c: (gst_init): Fix typo in error message. Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2730&r2=1.2731 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.214&r2=1.215 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2730 retrieving revision 1.2731 diff -u -d -r1.2730 -r1.2731 --- ChangeLog 10 Aug 2006 20:05:30 -0000 1.2730 +++ ChangeLog 11 Aug 2006 09:59:28 -0000 1.2731 @@ -1,3 +1,8 @@ +2006-08-11 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gst.c: (gst_init): + Fix typo in error message. 2006-08-10 Stefan Kost <en...@us...> * libs/gst/controller/gstcontroller.h: Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.214 retrieving revision 1.215 diff -u -d -r1.214 -r1.215 --- gst.c 17 Jul 2006 17:40:52 -0000 1.214 +++ gst.c 11 Aug 2006 09:59:29 -0000 1.215 @@ -385,7 +385,7 @@ GError *err = NULL; if (!gst_init_check (argc, argv, &err)) { - g_print ("Could not initialized GStreamer: %s\n", + g_print ("Could not initialize GStreamer: %s\n", err ? err->message : "unknown error occurred"); if (err) { g_error_free (err); |
From: <tp...@ke...> - 2006-08-14 12:35:19
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Aug 14 2006 12:35:18 UTC Log message: * gst/gststructure.c: Fix typo in docs and re-wrap docs blurb to not exceed 80 chars/line. * gst/gstvalue.h: Expand on the difference between arrays and lists as we use them. Modified files: . : ChangeLog gst : gststructure.c gstvalue.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2740&r2=1.2741 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gststructure.c.diff?r1=1.78&r2=1.79 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstvalue.h.diff?r1=1.43&r2=1.44 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2740 retrieving revision 1.2741 diff -u -d -r1.2740 -r1.2741 --- ChangeLog 14 Aug 2006 07:44:14 -0000 1.2740 +++ ChangeLog 14 Aug 2006 12:35:06 -0000 1.2741 @@ -1,3 +1,11 @@ +2006-08-14 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gststructure.c: + Fix typo in docs and re-wrap docs blurb to not exceed 80 chars/line. + * gst/gstvalue.h: + Expand on the difference between arrays and lists as we use them. + 2006-08-14 Wim Taymans <wi...@fl...> * libs/gst/base/gstbasesrc.c: (gst_base_src_change_state): Index: gststructure.c RCS file: /cvs/gstreamer/gstreamer/gst/gststructure.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- gststructure.c 27 Jul 2006 11:00:20 -0000 1.78 +++ gststructure.c 14 Aug 2006 12:35:06 -0000 1.79 @@ -24,27 +24,29 @@ * @short_description: Generic structure containing fields of names and values * @see_also: #GstCaps, #GstMessage, #GstEvent, #GstQuery * - * A #GstStructure is a collection of key/value pairs. The keys are expressed as - * GQuarks and the values can be of any GType. + * A #GstStructure is a collection of key/value pairs. The keys are expressed + * as GQuarks and the values can be of any GType. * In addition to the key/value pairs, a #GstStructure also has a name. * - * #GstStructure is used by various GStreamer subsystems to store information in - * a flexible an extensible way. A #GstStructure does not have a refcount because it - * usually is part of a higher level object such as #GstCaps. It provides a means to - * enforce mutability using the refcount of the parent with the - * gst_structure_set_parent_refcount() method. + * #GstStructure is used by various GStreamer subsystems to store information + * in a flexible and extensible way. A #GstStructure does not have a refcount + * because it usually is part of a higher level object such as #GstCaps. It + * provides a means to enforce mutability using the refcount of the parent + * with the gst_structure_set_parent_refcount() method. - * A #GstStructure can be created with gst_structure_empty_new() or gst_structure_new(), - * which both take a name and an optional set of key/value pairs along with the types - * of the values. + * A #GstStructure can be created with gst_structure_empty_new() or + * gst_structure_new(), which both take a name and an optional set of + * key/value pairs along with the types of the values. - * Field values can be changed with gst_structure_set_value() or gst_structure_set(). + * Field values can be changed with gst_structure_set_value() or + * gst_structure_set(). - * Field values can be retrieved with gst_structure_get_value() or the more convenient - * gst_structure_get_*() functions. + * Field values can be retrieved with gst_structure_get_value() or the more + * convenient gst_structure_get_*() functions. - * Fields can be removed with gst_structure_remove_field() or gst_structure_remove_fields(). + * Fields can be removed with gst_structure_remove_field() or + * gst_structure_remove_fields(). * Last reviewed on 2005-11-09 (0.9.4) */ @@ -975,8 +977,8 @@ * and has the correct type. * Returns: TRUE if the value could be set correctly. If there was no field - * with @fieldname or the existing field did not contain a boolean, this function - * returns FALSE. + * with @fieldname or the existing field did not contain a boolean, this + * function returns FALSE. gboolean gst_structure_get_boolean (const GstStructure * structure, Index: gstvalue.h RCS file: /cvs/gstreamer/gstreamer/gst/gstvalue.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gstvalue.h 27 Nov 2005 19:52:49 -0000 1.43 +++ gstvalue.h 14 Aug 2006 12:35:06 -0000 1.44 @@ -203,7 +203,11 @@ /** * GST_TYPE_LIST: - * a #GValue type that represents an unordered list of #GValue values + * a #GValue type that represents an unordered list of #GValue values. This + * is used for example to express a list of possible values for a field in + * a caps structure, like a list of possible sample rates, of which only one + * will be chosen in the end. This means that all values in the list are + * meaningful on their own. * Returns: the #GType of GstValueList (which is not explicitly typed) @@ -212,7 +216,12 @@ * GST_TYPE_ARRAY: - * a #GValue type that represents an ordered list of #GValue values + * a #GValue type that represents an ordered list of #GValue values. This is + * used to express a set of values that is meaningful only in their specific + * combination and order of values. Each value on its own is not particularly + * meaningful, only the ordered array in its entirety is meaningful. This is + * used for example to express channel layouts for multichannel audio where + * each channel needs to be mapped to a position in the room. * Returns: the #GType of GstArrayList (which is not explicitly typed) |
From: <tp...@ke...> - 2006-09-01 15:55:34
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Sep 01 2006 15:55:33 UTC Log message: * gst/gstinfo.c: (_gst_debug_nameof_funcptr): Fix locking order, handle NULL function values properly. * gst/gstinfo.h: Fix docs. * gst/gstpad.c: (gst_pad_buffer_alloc_unchecked): Initialised variable before using it and fix debug statement to print the address of the function rather than the address of the variable on the stack holding the address of the function. Modified files: . : ChangeLog gst : gstinfo.c gstinfo.h gstpad.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2788&r2=1.2789 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.c.diff?r1=1.127&r2=1.128 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.h.diff?r1=1.95&r2=1.96 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.525&r2=1.526 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2788 retrieving revision 1.2789 diff -u -d -r1.2788 -r1.2789 --- ChangeLog 1 Sep 2006 10:33:02 -0000 1.2788 +++ ChangeLog 1 Sep 2006 15:55:20 -0000 1.2789 @@ -1,3 +1,16 @@ +2006-09-01 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstinfo.c: (_gst_debug_nameof_funcptr): + Fix locking order, handle NULL function values properly. + * gst/gstinfo.h: + Fix docs. + * gst/gstpad.c: (gst_pad_buffer_alloc_unchecked): + Initialised variable before using it and fix debug statement to + print the address of the function rather than the address of the + variable on the stack holding the address of the function. 2006-09-01 Wim Taymans <wi...@fl...> * gst/gstghostpad.c: (gst_proxy_pad_do_event), Index: gstinfo.c RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- gstinfo.c 18 Aug 2006 10:52:33 -0000 1.127 +++ gstinfo.c 1 Sep 2006 15:55:20 -0000 1.128 @@ -1215,12 +1215,17 @@ Dl_info dlinfo; #endif + if (G_UNLIKELY (func == NULL)) + return "(NULL)"; + g_static_mutex_lock (&__dbg_functions_mutex); if (G_LIKELY (__gst_function_pointers)) { - g_static_mutex_lock (&__dbg_functions_mutex); ptrname = g_hash_table_lookup (__gst_function_pointers, ptr); g_static_mutex_unlock (&__dbg_functions_mutex); if (G_LIKELY (ptrname)) return ptrname; + } else { + g_static_mutex_unlock (&__dbg_functions_mutex); } /* we need to create an entry in the hash table for this one so we don't leak * the name */ Index: gstinfo.h RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.h,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- gstinfo.h 25 Jul 2006 13:06:14 -0000 1.95 +++ gstinfo.h 1 Sep 2006 15:55:20 -0000 1.96 @@ -887,12 +887,13 @@ /** * GST_DEBUG_FUNCPTR_NAME: - * @ptr: pointer to the function to look up the name + * @ptr: address of the function of which to look up the name * * Retrieves the name of the function, if it was previously registered with * GST_DEBUG_FUNCPTR(). If not, it returns a description of the pointer. - * Make sure you free the string after use. + * This macro returns a constant string which must not be modified or + * freed by the caller. */ #define GST_DEBUG_FUNCPTR_NAME(ptr) \ _gst_debug_nameof_funcptr((GstDebugFuncPtr)ptr) Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.525 retrieving revision 1.526 diff -u -d -r1.525 -r1.526 --- gstpad.c 28 Aug 2006 23:16:33 -0000 1.525 +++ gstpad.c 1 Sep 2006 15:55:20 -0000 1.526 @@ -2549,22 +2549,24 @@ if (G_UNLIKELY (GST_PAD_IS_FLUSHING (pad))) goto flushing; + bufferallocfunc = pad->bufferallocfunc; if (offset == GST_BUFFER_OFFSET_NONE) { GST_CAT_DEBUG_OBJECT (GST_CAT_PADS, pad, "calling bufferallocfunc &%s (@%p) for size %d offset NONE", - GST_DEBUG_FUNCPTR_NAME (bufferallocfunc), &bufferallocfunc, size); + GST_DEBUG_FUNCPTR_NAME (bufferallocfunc), bufferallocfunc, size); } else { "calling bufferallocfunc &%s (@%p) of for size %d offset %" G_GUINT64_FORMAT, GST_DEBUG_FUNCPTR_NAME (bufferallocfunc), - &bufferallocfunc, size, offset); + bufferallocfunc, size, offset); GST_OBJECT_UNLOCK (pad); /* G_LIKELY for now since most elements don't implement a buffer alloc * function and there is no default alloc proxy function as this is usually * not possible. */ - if (G_LIKELY ((bufferallocfunc = pad->bufferallocfunc) == NULL)) + if (G_LIKELY (bufferallocfunc == NULL)) goto fallback; ret = bufferallocfunc (pad, offset, size, caps, buf); |
From: <tp...@ke...> - 2006-09-03 11:07:04
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Sun Sep 03 2006 11:07:04 UTC Log message: * gst/gstregistryxml.c: (gst_registry_xml_save_feature): Print a warning rather than g_assert() if a plugin feature is a URI handler but returns no protocols (#353976). Modified files: . : ChangeLog gst : gstregistryxml.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2791&r2=1.2792 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstregistryxml.c.diff?r1=1.29&r2=1.30 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2791 retrieving revision 1.2792 diff -u -d -r1.2791 -r1.2792 --- ChangeLog 2 Sep 2006 19:10:56 -0000 1.2791 +++ ChangeLog 3 Sep 2006 11:06:52 -0000 1.2792 @@ -1,3 +1,9 @@ +2006-09-03 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstregistryxml.c: (gst_registry_xml_save_feature): + Print a warning rather than g_assert() if a plugin feature + is a URI handler but returns no protocols (#353976). 2006-09-02 Stefan Kost <en...@us...> * docs/random/moving-plugins: Index: gstregistryxml.c RCS file: /cvs/gstreamer/gstreamer/gst/gstregistryxml.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- gstregistryxml.c 18 Jul 2006 19:01:25 -0000 1.29 +++ gstregistryxml.c 3 Sep 2006 11:06:52 -0000 1.30 @@ -717,18 +717,22 @@ } if (GST_URI_TYPE_IS_VALID (factory->uri_type)) { - gchar **protocol; - if (!gst_registry_save_escaped (registry, " ", "uri_type", factory->uri_type == GST_URI_SINK ? "sink" : "source")) return FALSE; - g_assert (factory->uri_protocols); - protocol = factory->uri_protocols; - while (*protocol) { - if (!gst_registry_save_escaped (registry, " ", "uri_protocol", - *protocol)) - return FALSE; - protocol++; + if (factory->uri_protocols) { + gchar **protocol; + protocol = factory->uri_protocols; + while (*protocol) { + if (!gst_registry_save_escaped (registry, " ", "uri_protocol", + *protocol)) + return FALSE; + protocol++; + } + } else { + g_warning ("GStreamer feature '%s' is URI handler but does not provide" + " any protocols it can handle", feature->name); } } else if (GST_IS_TYPE_FIND_FACTORY (feature)) { |
From: <tp...@ke...> - 2006-09-03 11:17:04
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Sun Sep 03 2006 11:17:02 UTC Log message: * gst/gst.c: (ensure_current_registry_forking): Print better details when child was terminated by signal. Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2792&r2=1.2793 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.219&r2=1.220 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2792 retrieving revision 1.2793 diff -u -d -r1.2792 -r1.2793 --- ChangeLog 3 Sep 2006 11:06:52 -0000 1.2792 +++ ChangeLog 3 Sep 2006 11:16:50 -0000 1.2793 @@ -1,5 +1,10 @@ 2006-09-03 Tim-Philipp Müller <tim at centricular dot net> + * gst/gst.c: (ensure_current_registry_forking): + Print better details when child was terminated by signal. + +2006-09-03 Tim-Philipp Müller <tim at centricular dot net> * gst/gstregistryxml.c: (gst_registry_xml_save_feature): Print a warning rather than g_assert() if a plugin feature is a URI handler but returns no protocols (#353976). Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.219 retrieving revision 1.220 diff -u -d -r1.219 -r1.220 --- gst.c 20 Aug 2006 19:30:09 -0000 1.219 +++ gst.c 3 Sep 2006 11:16:50 -0000 1.220 @@ -723,7 +723,12 @@ } if (!WIFEXITED (status)) { - GST_ERROR ("child did not exit normally, status: %d", status); + if (WIFSIGNALED (status)) { + GST_ERROR ("child did not exit normally, terminated by signal %d", + WTERMSIG (status)); + } else { + GST_ERROR ("child did not exit normally, status: %d", status); + } return FALSE; |
From: <tp...@ke...> - 2006-09-22 10:17:28
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Sep 22 2006 10:17:27 UTC Log message: * gst/gstghostpad.c: (gst_ghost_pad_set_target): Don't forget to release proxy lock when there's an error. Modified files: . : ChangeLog gst : gstghostpad.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2815&r2=1.2816 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.c.diff?r1=1.43&r2=1.44 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2815 retrieving revision 1.2816 diff -u -d -r1.2815 -r1.2816 --- ChangeLog 20 Sep 2006 16:17:25 -0000 1.2815 +++ ChangeLog 22 Sep 2006 10:17:15 -0000 1.2816 @@ -1,3 +1,8 @@ +2006-09-22 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstghostpad.c: (gst_ghost_pad_set_target): + Don't forget to release proxy lock when there's an error. 2006-09-20 Jan Schmidt <th...@ma...> * gst/gstcaps.h: Index: gstghostpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- gstghostpad.c 18 Sep 2006 13:56:26 -0000 1.43 +++ gstghostpad.c 22 Sep 2006 10:17:15 -0000 1.44 @@ -1110,6 +1110,7 @@ lret); /* and unset target again */ gst_proxy_pad_set_target_unlocked (GST_PAD_CAST (gpad), NULL); + GST_PROXY_UNLOCK (gpad); return FALSE; } } |
From: <tp...@ke...> - 2006-09-25 10:36:37
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Sep 25 2006 10:36:35 UTC Log message: * gst/gstinfo.c: Fix warning if HAVE_PRINTF_EXTENSION is undefined (spotted by Peter Kjellerstedt). Modified files: . : ChangeLog gst : gstinfo.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2819&r2=1.2820 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.c.diff?r1=1.128&r2=1.129 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2819 retrieving revision 1.2820 diff -u -d -r1.2819 -r1.2820 --- ChangeLog 23 Sep 2006 09:30:39 -0000 1.2819 +++ ChangeLog 25 Sep 2006 10:36:23 -0000 1.2820 @@ -1,3 +1,9 @@ +2006-09-25 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstinfo.c: + Fix warning if HAVE_PRINTF_EXTENSION is undefined + (spotted by Peter Kjellerstedt). 2006-09-23 Wim Taymans <wi...@fl...> Based on patch by: Antoine Tremblay <hexa00 at gmail dot com> Index: gstinfo.c RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- gstinfo.c 1 Sep 2006 15:55:20 -0000 1.128 +++ gstinfo.c 25 Sep 2006 10:36:23 -0000 1.129 @@ -511,6 +511,8 @@ return g_strdup_printf ("%p", ptr); } +#ifdef HAVE_PRINTF_EXTENSION static gchar * gst_debug_print_segment (gpointer ptr) { @@ -553,6 +555,8 @@ } +#endif /* HAVE_PRINTF_EXTENSION */ /** * gst_debug_construct_term_color: * @colorinfo: the color info |
From: <tp...@ke...> - 2006-09-25 11:16:51
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Sep 25 2006 11:16:49 UTC Log message: * gst/gsturi.c: (search_by_entry): Don't assert/crash here if a uri handler doesn't return any supported protocols. The list of protocols could be generated dynamically at runtime or at plugin registration, and an error in the underlying library shouldn't be fatal (#353301). Modified files: . : ChangeLog gst : gsturi.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2820&r2=1.2821 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsturi.c.diff?r1=1.34&r2=1.35 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2820 retrieving revision 1.2821 diff -u -d -r1.2820 -r1.2821 --- ChangeLog 25 Sep 2006 10:36:23 -0000 1.2820 +++ ChangeLog 25 Sep 2006 11:16:37 -0000 1.2821 @@ -1,5 +1,13 @@ 2006-09-25 Tim-Philipp Müller <tim at centricular dot net> + * gst/gsturi.c: (search_by_entry): + Don't assert/crash here if a uri handler doesn't return any + supported protocols. The list of protocols could be generated + dynamically at runtime or at plugin registration, and an error + in the underlying library shouldn't be fatal (#353301). + +2006-09-25 Tim-Philipp Müller <tim at centricular dot net> * gst/gstinfo.c: Fix warning if HAVE_PRINTF_EXTENSION is undefined (spotted by Peter Kjellerstedt). Index: gsturi.c RCS file: /cvs/gstreamer/gstreamer/gst/gsturi.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- gsturi.c 5 Jul 2006 18:17:01 -0000 1.34 +++ gsturi.c 25 Sep 2006 11:16:37 -0000 1.35 @@ -475,8 +475,13 @@ return FALSE; protocols = gst_element_factory_get_uri_protocols (factory); - /* must be set when uri type is valid */ - g_assert (protocols); + if (protocols == NULL) { + g_warning ("Factory '%s' implements GstUriHandler interface but returned " + "no supported protocols!", gst_plugin_feature_get_name (feature)); + return FALSE; + } while (*protocols != NULL) { if (strcmp (*protocols, entry->protocol) == 0) return TRUE; |
From: <tp...@ke...> - 2006-09-25 13:08:44
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Sep 25 2006 13:08:41 UTC Log message: * gst/gstelementfactory.c: Fix typo in docs blurb. Modified files: . : ChangeLog gst : gstelementfactory.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2821&r2=1.2822 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstelementfactory.c.diff?r1=1.127&r2=1.128 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2821 retrieving revision 1.2822 diff -u -d -r1.2821 -r1.2822 --- ChangeLog 25 Sep 2006 11:16:37 -0000 1.2821 +++ ChangeLog 25 Sep 2006 13:08:29 -0000 1.2822 @@ -1,5 +1,10 @@ 2006-09-25 Tim-Philipp Müller <tim at centricular dot net> + * gst/gstelementfactory.c: + Fix typo in docs blurb. + +2006-09-25 Tim-Philipp Müller <tim at centricular dot net> * gst/gsturi.c: (search_by_entry): Don't assert/crash here if a uri handler doesn't return any supported protocols. The list of protocols could be generated Index: gstelementfactory.c RCS file: /cvs/gstreamer/gstreamer/gst/gstelementfactory.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- gstelementfactory.c 14 Aug 2006 15:33:17 -0000 1.127 +++ gstelementfactory.c 25 Sep 2006 13:08:29 -0000 1.128 @@ -628,9 +628,10 @@ * gst_element_factory_get_uri_protocols: * @factory: a #GstElementFactory * - * Gets a NULL-terminated array of protocols this element supports or NULL, if + * Gets a NULL-terminated array of protocols this element supports or NULL if * no protocols are supported. You may not change the contents of the returned - * array as it is still ownt by the element factory. Use g_strdupv() if you want to. + * array, as it is still owned by the element factory. Use g_strdupv() to + * make a copy of the protocol string array if you need to. * Returns: the supported protocols or NULL */ |
From: <tp...@ke...> - 2006-10-02 16:38:10
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Mon Oct 02 2006 16:38:08 UTC Log message: * gst/gstpad.c: Add 'Since: 0.10.11' to gst_pad_is_blocking() gtk-doc blurb. Modified files: . : ChangeLog gst : gstpad.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2842&r2=1.2843 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.527&r2=1.528 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2842 retrieving revision 1.2843 diff -u -d -r1.2842 -r1.2843 --- ChangeLog 2 Oct 2006 16:01:54 -0000 1.2842 +++ ChangeLog 2 Oct 2006 16:37:56 -0000 1.2843 @@ -1,3 +1,8 @@ +2006-10-02 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstpad.c: + Add 'Since: 0.10.11' to gst_pad_is_blocking() gtk-doc blurb. 2006-10-02 Edward Hervey <ed...@fl...> * docs/design/part-block.txt: @@ -14,7 +19,6 @@ API: GST_PAD_IS_BLOCKING() macro API: GST_PAD_BLOCKING GstPadFlag - 2006-10-02 Wim Taymans <wi...@fl...> Patch by: mrcgran <mrc.gran at gmail dot com> Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.527 retrieving revision 1.528 diff -u -d -r1.527 -r1.528 --- gstpad.c 2 Oct 2006 16:01:54 -0000 1.527 +++ gstpad.c 2 Oct 2006 16:37:56 -0000 1.528 @@ -1058,6 +1058,8 @@ * Returns: TRUE if the pad is blocking. * * MT safe. + * + * Since: 0.10.11 */ gboolean gst_pad_is_blocking (GstPad * pad) |
From: <tp...@ke...> - 2006-10-03 19:13:57
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Tue Oct 03 2006 19:13:48 UTC Log message: * gst/gstbus.c: (gst_bus_class_init), (gst_bus_post): More docs for the sync-message signal (mention that it is not emitted by default); log message structures of messages posted on the bus as well. Modified files: . : ChangeLog gst : gstbus.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2845&r2=1.2846 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstbus.c.diff?r1=1.59&r2=1.60 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2845 retrieving revision 1.2846 diff -u -d -r1.2845 -r1.2846 --- ChangeLog 3 Oct 2006 15:10:51 -0000 1.2845 +++ ChangeLog 3 Oct 2006 19:13:36 -0000 1.2846 @@ -1,3 +1,10 @@ +2006-10-03 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstbus.c: (gst_bus_class_init), (gst_bus_post): + More docs for the sync-message signal (mention that it is not + emitted by default); log message structures of messages posted on + the bus as well. 2006-10-03 Jan Schmidt <th...@ma...> * gst/gst.c: (ensure_current_registry_forking): Index: gstbus.c RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- gstbus.c 21 Jun 2006 10:01:58 -0000 1.59 +++ gstbus.c 3 Oct 2006 19:13:36 -0000 1.60 @@ -184,6 +184,13 @@ * * A message has been posted on the bus. This signal is emitted from the * thread that posted the message so one has to be careful with locking. + * + * This signal will not be emitted by default, you have to set up + * gst_bus_sync_signal_handler() as a sync handler if you want this + * signal to be emitted when a message is posted on the bus, like this: + * <programlisting> + * gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, yourdata); + * </programlisting> */ gst_bus_signals[SYNC_MESSAGE] = g_signal_new ("sync-message", G_TYPE_FROM_CLASS (klass), @@ -319,8 +326,8 @@ g_return_val_if_fail (GST_IS_BUS (bus), FALSE); g_return_val_if_fail (GST_IS_MESSAGE (message), FALSE); - GST_DEBUG_OBJECT (bus, "[msg %p] posting on bus, type %s", - message, GST_MESSAGE_TYPE_NAME (message)); + GST_DEBUG_OBJECT (bus, "[msg %p] posting on bus, type %s, %" GST_PTR_FORMAT, + message, GST_MESSAGE_TYPE_NAME (message), message->structure); GST_OBJECT_LOCK (bus); /* check if the bus is flushing */ |
From: <tp...@ke...> - 2006-10-06 17:21:46
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Oct 06 2006 17:21:45 UTC Log message: * gst/gstinfo.h: Those two function declarations do actually belong there, revert commit from yesterday that turned them intro macros. Modified files: . : ChangeLog gst : gstinfo.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2853&r2=1.2854 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.h.diff?r1=1.97&r2=1.98 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2853 retrieving revision 1.2854 diff -u -d -r1.2853 -r1.2854 --- ChangeLog 6 Oct 2006 14:46:03 -0000 1.2853 +++ ChangeLog 6 Oct 2006 17:21:32 -0000 1.2854 @@ -1,3 +1,9 @@ +2006-10-06 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstinfo.h: + Those two function declarations do actually belong there, revert + commit from yesterday that turned them intro macros. 2006-10-06 Zaheer Abbas Merali <zaheerabbas at merali dot org> Patch by: Josep Torre Valles <jo...@fl...> Index: gstinfo.h RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.h,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- gstinfo.h 5 Oct 2006 12:31:07 -0000 1.97 +++ gstinfo.h 6 Oct 2006 17:21:33 -0000 1.98 @@ -930,8 +930,8 @@ #define gst_debug_level_get_name(level) ("NONE") #define gst_debug_message_get(message) ("NONE") #define gst_debug_add_log_function(func,data) /* NOP */ -#define gst_debug_remove_log_function(func) (0) -#define gst_debug_remove_log_function_by_data(data) (0) +guint gst_debug_remove_log_function (GstLogFunction func); +guint gst_debug_remove_log_function_by_data (gpointer data); #define gst_debug_set_active(active) /* NOP */ #define gst_debug_is_active() (FALSE) #define gst_debug_set_colored(colored) /* NOP */ |
From: <tp...@ke...> - 2006-10-07 18:11:18
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Sat Oct 07 2006 18:11:15 UTC Log message: * gst/gsttaglist.h: Less tabs, more spaces. Modified files: . : ChangeLog gst : gsttaglist.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2854&r2=1.2855 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gsttaglist.h.diff?r1=1.34&r2=1.35 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2854 retrieving revision 1.2855 diff -u -d -r1.2854 -r1.2855 --- ChangeLog 6 Oct 2006 17:21:32 -0000 1.2854 +++ ChangeLog 7 Oct 2006 18:11:02 -0000 1.2855 @@ -1,3 +1,8 @@ +2006-10-07 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gsttaglist.h: + Less tabs, more spaces. 2006-10-06 Tim-Philipp Müller <tim at centricular dot net> * gst/gstinfo.h: Index: gsttaglist.h RCS file: /cvs/gstreamer/gstreamer/gst/gsttaglist.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- gsttaglist.h 14 Aug 2006 19:04:56 -0000 1.34 +++ gsttaglist.h 7 Oct 2006 18:11:03 -0000 1.35 @@ -81,9 +81,9 @@ * Opaque #GstTagList data structure. */ typedef GstStructure GstTagList; -#define GST_TAG_LIST(x) ((GstTagList *) (x)) -#define GST_IS_TAG_LIST(x) (gst_is_tag_list (GST_TAG_LIST (x))) -#define GST_TYPE_TAG_LIST (gst_tag_list_get_type ()) +#define GST_TAG_LIST(x) ((GstTagList *) (x)) +#define GST_IS_TAG_LIST(x) (gst_is_tag_list (GST_TAG_LIST (x))) +#define GST_TYPE_TAG_LIST (gst_tag_list_get_type ()) /** * GstTagForeachFunc: @@ -94,9 +94,9 @@ * A function that will be called in gst_tag_list_foreach(). The function may * not modify the tag list. -typedef void (*GstTagForeachFunc) (const GstTagList *list, - const gchar * tag, - gpointer user_data); +typedef void (*GstTagForeachFunc) (const GstTagList * list, + const gchar * tag, + gpointer user_data); * GstTagMergeFunc: @@ -106,176 +106,173 @@ * A function for merging multiple values of a tag used when registering * tags. -typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src); +typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src); /* initialize tagging system */ -void _gst_tag_initialize (void); -GType gst_tag_list_get_type (void); +void _gst_tag_initialize (void); +GType gst_tag_list_get_type (void); +void gst_tag_register (const gchar * name, + GstTagFlag flag, + GType type, + const gchar * nick, + const gchar * blurb, + GstTagMergeFunc func); -void gst_tag_register (const gchar * name, - GstTagFlag flag, - GType type, - const gchar * nick, - const gchar * blurb, - GstTagMergeFunc func); /* some default merging functions */ -void gst_tag_merge_use_first (GValue * dest, - const GValue * src); -void gst_tag_merge_strings_with_comma (GValue * dest, +void gst_tag_merge_use_first (GValue * dest, const GValue * src); +void gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src); /* basic tag support */ -gboolean gst_tag_exists (const gchar * tag); -GType gst_tag_get_type (const gchar * tag); -G_CONST_RETURN gchar * - gst_tag_get_nick (const gchar * tag); - gst_tag_get_description (const gchar * tag); -GstTagFlag gst_tag_get_flag (const gchar * tag); -gboolean gst_tag_is_fixed (const gchar * tag); +gboolean gst_tag_exists (const gchar * tag); +GType gst_tag_get_type (const gchar * tag); +G_CONST_RETURN gchar * gst_tag_get_nick (const gchar * tag); +G_CONST_RETURN gchar * gst_tag_get_description (const gchar * tag); +GstTagFlag gst_tag_get_flag (const gchar * tag); +gboolean gst_tag_is_fixed (const gchar * tag); /* tag lists */ -GstTagList * gst_tag_list_new (void); -gboolean gst_is_tag_list (gconstpointer p); -GstTagList * gst_tag_list_copy (const GstTagList * list); -void gst_tag_list_insert (GstTagList * into, - const GstTagList * from, - GstTagMergeMode mode); -GstTagList * gst_tag_list_merge (const GstTagList * list1, - const GstTagList * list2, -void gst_tag_list_free (GstTagList * list); -guint gst_tag_list_get_tag_size (const GstTagList * list, - const gchar * tag); -void gst_tag_list_add (GstTagList * list, - GstTagMergeMode mode, - const gchar * tag, - ...) G_GNUC_NULL_TERMINATED; -void gst_tag_list_add_values (GstTagList * list, -void gst_tag_list_add_valist (GstTagList * list, - va_list var_args); -void gst_tag_list_add_valist_values (GstTagList * list, -void gst_tag_list_remove_tag (GstTagList * list, -void gst_tag_list_foreach (const GstTagList * list, - GstTagForeachFunc func, - gpointer user_data); +GstTagList * gst_tag_list_new (void); +gboolean gst_is_tag_list (gconstpointer p); +GstTagList * gst_tag_list_copy (const GstTagList * list); +void gst_tag_list_insert (GstTagList * into, + const GstTagList * from, + GstTagMergeMode mode); +GstTagList * gst_tag_list_merge (const GstTagList * list1, + const GstTagList * list2, +void gst_tag_list_free (GstTagList * list); +guint gst_tag_list_get_tag_size (const GstTagList * list, + const gchar * tag); +void gst_tag_list_add (GstTagList * list, + GstTagMergeMode mode, + const gchar * tag, + ...) G_GNUC_NULL_TERMINATED; +void gst_tag_list_add_values (GstTagList * list, +void gst_tag_list_add_valist (GstTagList * list, + va_list var_args); +void gst_tag_list_add_valist_values (GstTagList * list, + va_list var_args); +void gst_tag_list_remove_tag (GstTagList * list, +void gst_tag_list_foreach (const GstTagList * list, + GstTagForeachFunc func, + gpointer user_data); G_CONST_RETURN GValue * - gst_tag_list_get_value_index (const GstTagList * list, - guint index); -gboolean gst_tag_list_copy_value (GValue * dest, - const GstTagList * list, + gst_tag_list_get_value_index (const GstTagList * list, + guint index); +gboolean gst_tag_list_copy_value (GValue * dest, + const GstTagList * list, /* simplifications (FIXME: do we want them?) */ -gboolean gst_tag_list_get_char (const GstTagList * list, - gchar * value); -gboolean gst_tag_list_get_char_index (const GstTagList * list, - guint index, -gboolean gst_tag_list_get_uchar (const GstTagList * list, - guchar * value); -gboolean gst_tag_list_get_uchar_index (const GstTagList * list, -gboolean gst_tag_list_get_boolean (const GstTagList * list, - gboolean * value); -gboolean gst_tag_list_get_boolean_index (const GstTagList * list, -gboolean gst_tag_list_get_int (const GstTagList * list, - gint * value); -gboolean gst_tag_list_get_int_index (const GstTagList * list, -gboolean gst_tag_list_get_uint (const GstTagList * list, - guint * value); -gboolean gst_tag_list_get_uint_index (const GstTagList * list, -gboolean gst_tag_list_get_long (const GstTagList * list, - glong * value); -gboolean gst_tag_list_get_long_index (const GstTagList * list, -gboolean gst_tag_list_get_ulong (const GstTagList * list, - gulong * value); -gboolean gst_tag_list_get_ulong_index (const GstTagList * list, -gboolean gst_tag_list_get_int64 (const GstTagList * list, - gint64 * value); -gboolean gst_tag_list_get_int64_index (const GstTagList * list, -gboolean gst_tag_list_get_uint64 (const GstTagList * list, - guint64 * value); -gboolean gst_tag_list_get_uint64_index (const GstTagList * list, -gboolean gst_tag_list_get_float (const GstTagList * list, - gfloat * value); -gboolean gst_tag_list_get_float_index (const GstTagList * list, -gboolean gst_tag_list_get_double (const GstTagList * list, - gdouble * value); -gboolean gst_tag_list_get_double_index (const GstTagList * list, -gboolean gst_tag_list_get_string (const GstTagList * list, - gchar ** value); -gboolean gst_tag_list_get_string_index (const GstTagList * list, -gboolean gst_tag_list_get_pointer (const GstTagList * list, - gpointer * value); -gboolean gst_tag_list_get_pointer_index (const GstTagList * list, -gboolean gst_tag_list_get_date (const GstTagList * list, - const gchar * tag, - GDate ** value); -gboolean gst_tag_list_get_date_index (const GstTagList * list, - guint index, +gboolean gst_tag_list_get_char (const GstTagList * list, + gchar * value); +gboolean gst_tag_list_get_char_index (const GstTagList * list, + guint index, +gboolean gst_tag_list_get_uchar (const GstTagList * list, + guchar * value); +gboolean gst_tag_list_get_uchar_index (const GstTagList * list, +gboolean gst_tag_list_get_boolean (const GstTagList * list, + gboolean * value); +gboolean gst_tag_list_get_boolean_index (const GstTagList * list, +gboolean gst_tag_list_get_int (const GstTagList * list, + gint * value); +gboolean gst_tag_list_get_int_index (const GstTagList * list, +gboolean gst_tag_list_get_uint (const GstTagList * list, + guint * value); +gboolean gst_tag_list_get_uint_index (const GstTagList * list, +gboolean gst_tag_list_get_long (const GstTagList * list, + glong * value); +gboolean gst_tag_list_get_long_index (const GstTagList * list, +gboolean gst_tag_list_get_ulong (const GstTagList * list, + gulong * value); +gboolean gst_tag_list_get_ulong_index (const GstTagList * list, +gboolean gst_tag_list_get_int64 (const GstTagList * list, + gint64 * value); +gboolean gst_tag_list_get_int64_index (const GstTagList * list, +gboolean gst_tag_list_get_uint64 (const GstTagList * list, + guint64 * value); +gboolean gst_tag_list_get_uint64_index (const GstTagList * list, +gboolean gst_tag_list_get_float (const GstTagList * list, + gfloat * value); +gboolean gst_tag_list_get_float_index (const GstTagList * list, +gboolean gst_tag_list_get_double (const GstTagList * list, + gdouble * value); +gboolean gst_tag_list_get_double_index (const GstTagList * list, +gboolean gst_tag_list_get_string (const GstTagList * list, + gchar ** value); +gboolean gst_tag_list_get_string_index (const GstTagList * list, +gboolean gst_tag_list_get_pointer (const GstTagList * list, + gpointer * value); +gboolean gst_tag_list_get_pointer_index (const GstTagList * list, +gboolean gst_tag_list_get_date (const GstTagList * list, + GDate ** value); +gboolean gst_tag_list_get_date_index (const GstTagList * list, /* GStreamer core tags */ @@ -283,37 +280,37 @@ * * commonly used title (string) -#define GST_TAG_TITLE "title" +#define GST_TAG_TITLE "title" * GST_TAG_ARTIST: * person(s) responsible for the recording (string) -#define GST_TAG_ARTIST "artist" +#define GST_TAG_ARTIST "artist" * GST_TAG_ALBUM: * album containing this data (string) -#define GST_TAG_ALBUM "album" +#define GST_TAG_ALBUM "album" * GST_TAG_DATE: * date the data was created (#GDate structure) -#define GST_TAG_DATE "date" +#define GST_TAG_DATE "date" * GST_TAG_GENRE: * genre this data belongs to (string) -#define GST_TAG_GENRE "genre" +#define GST_TAG_GENRE "genre" * GST_TAG_COMMENT: * free text commenting the data (string) -#define GST_TAG_COMMENT "comment" +#define GST_TAG_COMMENT "comment" * GST_TAG_EXTENDED_COMMENT: @@ -328,181 +325,181 @@ * Since: 0.10.10 -#define GST_TAG_EXTENDED_COMMENT "extended-comment" +#define GST_TAG_EXTENDED_COMMENT "extended-comment" * GST_TAG_TRACK_NUMBER: * track number inside a collection (unsigned integer) -#define GST_TAG_TRACK_NUMBER "track-number" +#define GST_TAG_TRACK_NUMBER "track-number" * GST_TAG_TRACK_COUNT: * count of tracks inside collection this track belongs to (unsigned integer) -#define GST_TAG_TRACK_COUNT "track-count" +#define GST_TAG_TRACK_COUNT "track-count" * GST_TAG_ALBUM_VOLUME_NUMBER: * disc number inside a collection (unsigned integer) -#define GST_TAG_ALBUM_VOLUME_NUMBER "album-disc-number" +#define GST_TAG_ALBUM_VOLUME_NUMBER "album-disc-number" * GST_TAG_ALBUM_VOLUME_COUNT: * count of discs inside collection this disc belongs to (unsigned integer) -#define GST_TAG_ALBUM_VOLUME_COUNT "album-disc-count" +#define GST_TAG_ALBUM_VOLUME_COUNT "album-disc-count" * GST_TAG_LOCATION: * original location of file as a URI (string) -#define GST_TAG_LOCATION "location" +#define GST_TAG_LOCATION "location" * GST_TAG_DESCRIPTION: * short text describing the content of the data (string) -#define GST_TAG_DESCRIPTION "description" +#define GST_TAG_DESCRIPTION "description" * GST_TAG_VERSION: * version of this data (string) -#define GST_TAG_VERSION "version" +#define GST_TAG_VERSION "version" * GST_TAG_ISRC: * International Standard Recording Code - see http://www.ifpi.org/isrc/ (string) -#define GST_TAG_ISRC "isrc" +#define GST_TAG_ISRC "isrc" * GST_TAG_ORGANIZATION: * organization (string) -#define GST_TAG_ORGANIZATION "organization" +#define GST_TAG_ORGANIZATION "organization" * GST_TAG_COPYRIGHT: * copyright notice of the data (string) -#define GST_TAG_COPYRIGHT "copyright" +#define GST_TAG_COPYRIGHT "copyright" * GST_TAG_CONTACT: * contact information (string) -#define GST_TAG_CONTACT "contact" +#define GST_TAG_CONTACT "contact" * GST_TAG_LICENSE: * license of data (string) -#define GST_TAG_LICENSE "license" +#define GST_TAG_LICENSE "license" * GST_TAG_PERFORMER: * person(s) performing (string) -#define GST_TAG_PERFORMER "performer" +#define GST_TAG_PERFORMER "performer" * GST_TAG_DURATION: * length in GStreamer time units (nanoseconds) (unsigned 64-bit integer) -#define GST_TAG_DURATION "duration" +#define GST_TAG_DURATION "duration" * GST_TAG_CODEC: * codec the data is stored in (string) -#define GST_TAG_CODEC "codec" +#define GST_TAG_CODEC "codec" * GST_TAG_VIDEO_CODEC: * codec the video data is stored in (string) -#define GST_TAG_VIDEO_CODEC "video-codec" +#define GST_TAG_VIDEO_CODEC "video-codec" * GST_TAG_AUDIO_CODEC: * codec the audio data is stored in (string) -#define GST_TAG_AUDIO_CODEC "audio-codec" +#define GST_TAG_AUDIO_CODEC "audio-codec" * GST_TAG_BITRATE: * exact or average bitrate in bits/s (unsigned integer) -#define GST_TAG_BITRATE "bitrate" +#define GST_TAG_BITRATE "bitrate" * GST_TAG_NOMINAL_BITRATE: * nominal bitrate in bits/s (unsigned integer) -#define GST_TAG_NOMINAL_BITRATE "nominal-bitrate" +#define GST_TAG_NOMINAL_BITRATE "nominal-bitrate" * GST_TAG_MINIMUM_BITRATE: * minimum bitrate in bits/s (unsigned integer) -#define GST_TAG_MINIMUM_BITRATE "minimum-bitrate" +#define GST_TAG_MINIMUM_BITRATE "minimum-bitrate" * GST_TAG_MAXIMUM_BITRATE: * maximum bitrate in bits/s (unsigned integer) -#define GST_TAG_MAXIMUM_BITRATE "maximum-bitrate" +#define GST_TAG_MAXIMUM_BITRATE "maximum-bitrate" * GST_TAG_SERIAL: * serial number of track (unsigned integer) -#define GST_TAG_SERIAL "serial" +#define GST_TAG_SERIAL "serial" * GST_TAG_ENCODER: * encoder used to encode this stream (string) -#define GST_TAG_ENCODER "encoder" +#define GST_TAG_ENCODER "encoder" * GST_TAG_ENCODER_VERSION: * version of the encoder used to encode this stream (unsigned integer) -#define GST_TAG_ENCODER_VERSION "encoder-version" +#define GST_TAG_ENCODER_VERSION "encoder-version" * GST_TAG_TRACK_GAIN: * track gain in db (double) -#define GST_TAG_TRACK_GAIN "replaygain-track-gain" +#define GST_TAG_TRACK_GAIN "replaygain-track-gain" * GST_TAG_TRACK_PEAK: * peak of the track (double) -#define GST_TAG_TRACK_PEAK "replaygain-track-peak" +#define GST_TAG_TRACK_PEAK "replaygain-track-peak" * GST_TAG_ALBUM_GAIN: * album gain in db (double) -#define GST_TAG_ALBUM_GAIN "replaygain-album-gain" +#define GST_TAG_ALBUM_GAIN "replaygain-album-gain" * GST_TAG_ALBUM_PEAK: * peak of the album (double) -#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" +#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" * GST_TAG_LANGUAGE_CODE: * Language code (ISO-639-1) (string) -#define GST_TAG_LANGUAGE_CODE "language-code" +#define GST_TAG_LANGUAGE_CODE "language-code" * GST_TAG_IMAGE: @@ -510,7 +507,7 @@ * Since: 0.10.6 -#define GST_TAG_IMAGE "image" +#define GST_TAG_IMAGE "image" * GST_TAG_PREVIEW_IMAGE: @@ -519,7 +516,7 @@ * Since: 0.10.7 -#define GST_TAG_PREVIEW_IMAGE "preview-image" +#define GST_TAG_PREVIEW_IMAGE "preview-image" G_END_DECLS |
From: <tp...@ke...> - 2006-10-08 13:27:33
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Sun Oct 08 2006 13:27:29 UTC Log message: * gst/gstelement.h: gcc versions prior to gcc 3.3 apparently complain about a NULL printf format string, so don't use G_GNUC_PRINTF for those versions. Modified files: . : ChangeLog gst : gstelement.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2856&r2=1.2857 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstelement.h.diff?r1=1.232&r2=1.233 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2856 retrieving revision 1.2857 diff -u -d -r1.2856 -r1.2857 --- ChangeLog 7 Oct 2006 18:41:18 -0000 1.2856 +++ ChangeLog 8 Oct 2006 13:27:16 -0000 1.2857 @@ -1,3 +1,9 @@ +2006-10-08 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gstelement.h: + gcc versions prior to gcc 3.3 apparently complain about a NULL printf + format string, so don't use G_GNUC_PRINTF for those versions. 2006-10-07 Tim-Philipp Müller <tim at centricular dot net> * gst/gsttaglist.c: (gst_is_tag_list): Index: gstelement.h RCS file: /cvs/gstreamer/gstreamer/gst/gstelement.h,v retrieving revision 1.232 retrieving revision 1.233 diff -u -d -r1.232 -r1.233 --- gstelement.h 5 Oct 2006 12:31:07 -0000 1.232 +++ gstelement.h 8 Oct 2006 13:27:17 -0000 1.233 @@ -570,7 +570,8 @@ gboolean gst_element_post_message (GstElement * element, GstMessage * message); /* error handling */ -#ifdef GST_USING_PRINTF_EXTENSION +/* gcc versions < 3.3 warn about NULL being passed as format to printf */ +#if (defined(GST_USING_PRINTF_EXTENSION) || !defined(__GNUC__) || (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)) gchar * _gst_element_error_printf (const gchar *format, ...); #else gchar * _gst_element_error_printf (const gchar *format, ...) G_GNUC_PRINTF (1, 2); |
From: <tp...@ke...> - 2006-10-11 12:16:21
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Wed Oct 11 2006 12:16:17 UTC Log message: * gst/gst.c: (ensure_current_registry_forking): Check return value of write() to make compiler happy. Modified files: . : ChangeLog gst : gst.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2869&r2=1.2870 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.226&r2=1.227 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2869 retrieving revision 1.2870 diff -u -d -r1.2869 -r1.2870 --- ChangeLog 11 Oct 2006 10:10:37 -0000 1.2869 +++ ChangeLog 11 Oct 2006 12:16:04 -0000 1.2870 @@ -1,3 +1,8 @@ +2006-10-11 Tim-Philipp Müller <tim at centricular dot net> + + * gst/gst.c: (ensure_current_registry_forking): + Check return value of write() to make compiler happy. 2006-10-11 Wim Taymans <wi...@fl...> Patch by: Sjoerd Simons <sjoerd at luon dot net> Index: gst.c RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v retrieving revision 1.226 retrieving revision 1.227 diff -u -d -r1.226 -r1.227 --- gst.c 6 Oct 2006 14:46:03 -0000 1.226 +++ gst.c 11 Oct 2006 12:16:05 -0000 1.227 @@ -303,8 +303,8 @@ "GST_AUTOPLUG:5,GST_ELEMENT_*:3"), N_("LIST")}, {"gst-debug-no-color", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, - (gpointer) parse_goption_arg, N_("Disable colored debugging output"), - NULL}, + (gpointer) parse_goption_arg, N_("Disable colored debugging output"), + NULL}, {"gst-debug-disable", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, N_("Disable debugging"), NULL}, #endif @@ -738,7 +738,9 @@ /* write a result byte to the pipe */ res_byte = res ? '1' : '0'; - write (pfd[1], &res_byte, 1); + if (write (pfd[1], &res_byte, 1) != 1 || close (pfd[1]) != 0) { + /* could not write to pipe, probably means parent has exited before us */ + } _exit (0); } else { int ret; |