[gst-cvs] wtay gst-plugins-good: gst-plugins-good/ gst-plugins-good/ext/gconf/

[<wt...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     wtay
Date:           Thu Mar 22 2007  09:44:29 UTC

Log message:
Patch by: Christophe Dehais <christophe dot dehais at gmail dot com>
* ext/gconf/gconf.c: (gst_gconf_render_bin_with_default):
Accept complex pipeline descriptions as an audio profile instead of just
a single element. Fixes #420658.

Modified files:
    .               : ChangeLog
    ext/gconf       : gconf.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2835&r2=1.2836
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/gconf/gconf.c.diff?r1=1.8&r2=1.9

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.2835
retrieving revision 1.2836
diff -u -d -r1.2835 -r1.2836
--- ChangeLog	21 Mar 2007 11:49:31 -0000	1.2835
+++ ChangeLog	22 Mar 2007 09:44:17 -0000	1.2836
@@ -1,3 +1,11 @@
+2007-03-22  Wim Taymans  <wi...@fl...>
+
+	Patch by: Christophe Dehais <christophe dot dehais at gmail dot com>
+	* ext/gconf/gconf.c: (gst_gconf_render_bin_with_default):
+	Accept complex pipeline descriptions as an audio profile instead of just
+	a single element. Fixes #420658.
 2007-03-21  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/apetag/gsttagdemux.c: (gst_tag_demux_get_type):
Index: gconf.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/gconf/gconf.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gconf.c	13 Feb 2007 16:01:29 -0000	1.8
+++ gconf.c	22 Mar 2007 09:44:17 -0000	1.9
@@ -162,11 +162,10 @@
 /**
  * gst_gconf_render_bin_with_default:
- * @bin: a #gchar string corresponding to pipeline to construct.
- * @default: a pipeline description to use as default if the GConf key
- *   pipeline fails to construct.
+ * @bin: a #gchar string describing the pipeline to construct.
+ * @default_sink: an element to use as default if the given pipeline fails to construct.
  *
- * Render bin from GConf key @key using @default as a fallback.
+ * Render bin from description @bin using @default_sink element as a fallback.
  * Returns: a #GstElement containing the rendered bin.
  */
@@ -175,14 +174,16 @@
     const gchar * default_sink)
 {
   GstElement *ret;
+  GError *err = NULL;
-  ret = gst_element_factory_make (bin, NULL);
+  ret = gst_parse_bin_from_description (bin, TRUE, &err);
-  if (!ret) {
+  if (err) {
     ret = gst_element_factory_make (default_sink, NULL);
     if (!ret)
-      g_warning ("No GConf default audio sink key and %s doesn't work",
+      g_warning
+          ("Could not build GConf audio sink and the replacement %s doesn't work",
           DEFAULT_AUDIOSINK);
   }