mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
ext/gconf/gconf.c: Accept complex pipeline descriptions as an audio profile instead of just a single element. Fixes #...
Original commit message from CVS: 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.
This commit is contained in:
parent
a1a03796da
commit
c410265b6a
2 changed files with 16 additions and 7 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-03-22 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
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):
|
||||
|
|
|
@ -162,11 +162,10 @@ gst_gconf_render_bin_from_key (const gchar * key)
|
|||
|
||||
/**
|
||||
* 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 @@ gst_gconf_render_bin_with_default (const gchar * bin,
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue