mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 01:30:38 +00:00
gst-libs/gst/gconf/gconf.*: Fix some Andy Problem [tm].
Original commit message from CVS: * gst-libs/gst/gconf/gconf.c: * gst-libs/gst/gconf/gconf.h: Fix some Andy Problem [tm].
This commit is contained in:
Ronald S. Bultje
parent
7d10d86635
commit
6550429258
3 changed files with 6 additions and 374 deletions
|
|
@ -1,3 +1,9 @@
|
||||||
|
2005-08-05 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* gst-libs/gst/gconf/gconf.c:
|
||||||
|
* gst-libs/gst/gconf/gconf.h:
|
||||||
|
Fix some Andy Problem [tm].
|
||||||
|
|
||||||
2005-08-04 Andy Wingo <wingo@pobox.com>
|
2005-08-04 Andy Wingo <wingo@pobox.com>
|
||||||
|
|
||||||
* gst/videoscale/gstvideoscale.c (gst_videoscale_get_size):
|
* gst/videoscale/gstvideoscale.c (gst_videoscale_get_size):
|
||||||
|
|
|
||||||
|
|
@ -1,327 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* this library handles interaction with GConf
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "gconf.h"
|
|
||||||
|
|
||||||
#ifndef GST_GCONF_DIR
|
|
||||||
#error "GST_GCONF_DIR is not defined !"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static GConfClient *_gst_gconf_client = NULL; /* GConf connection */
|
|
||||||
|
|
||||||
|
|
||||||
/* internal functions */
|
|
||||||
|
|
||||||
static GConfClient *
|
|
||||||
gst_gconf_get_client (void)
|
|
||||||
{
|
|
||||||
if (!_gst_gconf_client)
|
|
||||||
_gst_gconf_client = gconf_client_get_default ();
|
|
||||||
|
|
||||||
return _gst_gconf_client;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* go through a bin, finding the one pad that is unconnected in the given
|
|
||||||
* * direction, and return that pad */
|
|
||||||
static GstPad *
|
|
||||||
gst_bin_find_unconnected_pad (GstBin * bin, GstPadDirection direction)
|
|
||||||
{
|
|
||||||
GstPad *pad = NULL;
|
|
||||||
GList *elements = NULL;
|
|
||||||
const GList *pads = NULL;
|
|
||||||
GstElement *element = NULL;
|
|
||||||
|
|
||||||
GST_LOCK (bin);
|
|
||||||
elements = bin->children;
|
|
||||||
/* traverse all elements looking for unconnected pads */
|
|
||||||
while (elements && pad == NULL) {
|
|
||||||
element = GST_ELEMENT (elements->data);
|
|
||||||
GST_LOCK (element);
|
|
||||||
pads = element->pads;
|
|
||||||
while (pads) {
|
|
||||||
GstPad *testpad = GST_PAD (pads->data);
|
|
||||||
|
|
||||||
/* check if the direction matches */
|
|
||||||
if (GST_PAD_DIRECTION (testpad) == direction) {
|
|
||||||
GST_LOCK (testpad);
|
|
||||||
if (GST_PAD_PEER (testpad) == NULL) {
|
|
||||||
GST_UNLOCK (testpad);
|
|
||||||
/* found it ! */
|
|
||||||
pad = testpad;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
GST_UNLOCK (testpad);
|
|
||||||
}
|
|
||||||
pads = g_list_next (pads);
|
|
||||||
}
|
|
||||||
GST_UNLOCK (element);
|
|
||||||
elements = g_list_next (elements);
|
|
||||||
}
|
|
||||||
GST_UNLOCK (bin);
|
|
||||||
|
|
||||||
return pad;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* external functions */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_string:
|
|
||||||
* @key: a #gchar corresponding to the key you want to get.
|
|
||||||
*
|
|
||||||
* Get GConf key @key's string value.
|
|
||||||
*
|
|
||||||
* Returns: a newly allocated #gchar string containing @key's value,
|
|
||||||
* or NULL in the case of an error..
|
|
||||||
*/
|
|
||||||
gchar *
|
|
||||||
gst_gconf_get_string (const gchar * key)
|
|
||||||
{
|
|
||||||
GError *error = NULL;
|
|
||||||
gchar *value = NULL;
|
|
||||||
gchar *full_key = g_strdup_printf ("%s/%s", GST_GCONF_DIR, key);
|
|
||||||
|
|
||||||
|
|
||||||
value = gconf_client_get_string (gst_gconf_get_client (), full_key, &error);
|
|
||||||
g_free (full_key);
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
g_warning ("gst_gconf_get_string: error: %s\n", error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_set_string:
|
|
||||||
* @key: a #gchar corresponding to the key you want to set.
|
|
||||||
* @value: a #gchar containing key value.
|
|
||||||
*
|
|
||||||
* Set GConf key @key to string value @value.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
gst_gconf_set_string (const gchar * key, const gchar * value)
|
|
||||||
{
|
|
||||||
GError *error = NULL;
|
|
||||||
gchar *full_key = g_strdup_printf ("%s/%s", GST_GCONF_DIR, key);
|
|
||||||
|
|
||||||
gconf_client_set_string (gst_gconf_get_client (), full_key, value, &error);
|
|
||||||
if (error) {
|
|
||||||
GST_ERROR ("gst_gconf_set_string: error: %s\n", error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
}
|
|
||||||
g_free (full_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_render_bin_from_description:
|
|
||||||
* @description: a #gchar string describing the bin.
|
|
||||||
*
|
|
||||||
* Render bin from description @description.
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the rendered bin.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_render_bin_from_description (const gchar * description)
|
|
||||||
{
|
|
||||||
GstElement *bin = NULL;
|
|
||||||
GstPad *pad = NULL;
|
|
||||||
GError *error = NULL;
|
|
||||||
gchar *desc = NULL;
|
|
||||||
|
|
||||||
/* parse the pipeline to a bin */
|
|
||||||
desc = g_strdup_printf ("bin.( %s )", description);
|
|
||||||
bin = GST_ELEMENT (gst_parse_launch (desc, &error));
|
|
||||||
g_free (desc);
|
|
||||||
if (error) {
|
|
||||||
GST_ERROR ("gstgconf: error parsing pipeline %s\n%s\n",
|
|
||||||
description, error->message);
|
|
||||||
g_error_free (error);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* find pads and ghost them if necessary */
|
|
||||||
if ((pad = gst_bin_find_unconnected_pad (GST_BIN (bin), GST_PAD_SRC))) {
|
|
||||||
gst_element_add_pad (bin, gst_ghost_pad_new ("src", pad));
|
|
||||||
}
|
|
||||||
if ((pad = gst_bin_find_unconnected_pad (GST_BIN (bin), GST_PAD_SINK))) {
|
|
||||||
gst_element_add_pad (bin, gst_ghost_pad_new ("sink", pad));
|
|
||||||
}
|
|
||||||
return bin;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_render_bin_from_key:
|
|
||||||
* @key: a #gchar string corresponding to a GConf key.
|
|
||||||
*
|
|
||||||
* Render bin from GConf key @key.
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the rendered bin.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_render_bin_from_key (const gchar * key)
|
|
||||||
{
|
|
||||||
GstElement *bin = NULL;
|
|
||||||
gchar *value;
|
|
||||||
|
|
||||||
value = gst_gconf_get_string (key);
|
|
||||||
if (value)
|
|
||||||
bin = gst_gconf_render_bin_from_description (value);
|
|
||||||
g_free (value);
|
|
||||||
return bin;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_default_audio_sink:
|
|
||||||
*
|
|
||||||
* Render audio output bin from GStreamer GConf key : "default/audiosink".
|
|
||||||
* If key is invalid, the default audio sink for the platform is used
|
|
||||||
* (typically osssink or sunaudiosink).
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the audio output bin, or NULL if
|
|
||||||
* everything failed.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_get_default_audio_sink (void)
|
|
||||||
{
|
|
||||||
GstElement *ret = gst_gconf_render_bin_from_key ("default/audiosink");
|
|
||||||
|
|
||||||
if (!ret) {
|
|
||||||
ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL);
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_warning ("No GConf default audio sink key and %s doesn't work",
|
|
||||||
DEFAULT_AUDIOSINK);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_default_video_sink:
|
|
||||||
*
|
|
||||||
* Render video output bin from GStreamer GConf key : "default/videosink".
|
|
||||||
* If key is invalid, the default video sink for the platform is used
|
|
||||||
* (typically xvimagesink or ximagesink).
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the video output bin, or NULL if
|
|
||||||
* everything failed.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_get_default_video_sink (void)
|
|
||||||
{
|
|
||||||
GstElement *ret = gst_gconf_render_bin_from_key ("default/videosink");
|
|
||||||
|
|
||||||
if (!ret) {
|
|
||||||
ret = gst_element_factory_make (DEFAULT_VIDEOSINK, NULL);
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_warning ("No GConf default video sink key and %s doesn't work",
|
|
||||||
DEFAULT_VIDEOSINK);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_default_audio_src:
|
|
||||||
*
|
|
||||||
* Render audio acquisition bin from GStreamer GConf key : "default/audiosrc".
|
|
||||||
* If key is invalid, the default audio source for the plaform is used.
|
|
||||||
* (typically osssrc or sunaudiosrc).
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the audio source bin, or NULL if
|
|
||||||
* everything failed.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_get_default_audio_src (void)
|
|
||||||
{
|
|
||||||
GstElement *ret = gst_gconf_render_bin_from_key ("default/audiosrc");
|
|
||||||
|
|
||||||
if (!ret) {
|
|
||||||
ret = gst_element_factory_make (DEFAULT_AUDIOSRC, NULL);
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_warning ("No GConf default audio src key and %s doesn't work",
|
|
||||||
DEFAULT_AUDIOSRC);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_default_video_src:
|
|
||||||
*
|
|
||||||
* Render video acquisition bin from GStreamer GConf key :
|
|
||||||
* "default/videosrc". If key is invalid, the default video source
|
|
||||||
* for the platform is used (typically videotestsrc).
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the video source bin, or NULL if
|
|
||||||
* everything failed.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_get_default_video_src (void)
|
|
||||||
{
|
|
||||||
GstElement *ret = gst_gconf_render_bin_from_key ("default/videosrc");
|
|
||||||
|
|
||||||
if (!ret) {
|
|
||||||
ret = gst_element_factory_make (DEFAULT_VIDEOSRC, NULL);
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_warning ("No GConf default video src key and %s doesn't work",
|
|
||||||
DEFAULT_VIDEOSRC);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gst_gconf_get_default_visualization_element:
|
|
||||||
*
|
|
||||||
* Render visualization bin from GStreamer GConf key : "default/visualization".
|
|
||||||
* If key is invalid, the default visualization element is used.
|
|
||||||
*
|
|
||||||
* Returns: a #GstElement containing the visualization bin, or NULL if
|
|
||||||
* everything failed.
|
|
||||||
*/
|
|
||||||
GstElement *
|
|
||||||
gst_gconf_get_default_visualization_element (void)
|
|
||||||
{
|
|
||||||
GstElement *ret = gst_gconf_render_bin_from_key ("default/visualization");
|
|
||||||
|
|
||||||
if (!ret) {
|
|
||||||
ret = gst_element_factory_make (DEFAULT_VISUALIZER, NULL);
|
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
g_warning
|
|
||||||
("No GConf default visualization plugin key and %s doesn't work",
|
|
||||||
DEFAULT_VISUALIZER);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
/* GStreamer
|
|
||||||
* Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Library General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Library General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Library General Public
|
|
||||||
* License along with this library; if not, write to the
|
|
||||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
* Boston, MA 02111-1307, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef GST_GCONF_H
|
|
||||||
#define GST_GCONF_H
|
|
||||||
|
|
||||||
/*
|
|
||||||
* this library handles interaction with GConf
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <gst/gst.h>
|
|
||||||
#include <gconf/gconf-client.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
gchar * gst_gconf_get_string (const gchar *key);
|
|
||||||
void gst_gconf_set_string (const gchar *key,
|
|
||||||
const gchar *value);
|
|
||||||
|
|
||||||
GstElement * gst_gconf_render_bin_from_key (const gchar *key);
|
|
||||||
GstElement * gst_gconf_render_bin_from_description (const gchar *description);
|
|
||||||
|
|
||||||
GstElement * gst_gconf_get_default_video_sink (void);
|
|
||||||
GstElement * gst_gconf_get_default_audio_sink (void);
|
|
||||||
GstElement * gst_gconf_get_default_video_src (void);
|
|
||||||
GstElement * gst_gconf_get_default_audio_src (void);
|
|
||||||
GstElement * gst_gconf_get_default_visualization_element (void);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* GST_GCONF_H */
|
|
||||||
Loading…
Reference in a new issue