mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-29 19:50:40 +00:00
added functions gst_gconf_get_default_{audio,video}_sink -- this is so the defaults library (gstgconf) can be used by...
Original commit message from CVS: added functions gst_gconf_get_default_{audio,video}_sink -- this is so the defaults library (gstgconf) can be used by applications with uninstalled gstreamer (ie, no gconf keys). More specifically, these functions enable the player to work uninstalled, which is a good thing (tm).
This commit is contained in:
parent
7d0eff15e3
commit
0d77729509
3 changed files with 44 additions and 5 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit fa2e4df50fd965b1dbd3b35b87d914ff87362815
|
Subproject commit 2f0e1ecbfe7d27cf1b2215204958c95516db173d
|
|
@ -11,7 +11,7 @@ static GConfClient *_gst_gconf_client = NULL; /* GConf connection */
|
||||||
|
|
||||||
/* internal functions */
|
/* internal functions */
|
||||||
|
|
||||||
GConfClient *
|
static GConfClient *
|
||||||
gst_gconf_get_client (void)
|
gst_gconf_get_client (void)
|
||||||
{
|
{
|
||||||
if (!_gst_gconf_client)
|
if (!_gst_gconf_client)
|
||||||
|
@ -19,9 +19,10 @@ gst_gconf_get_client (void)
|
||||||
|
|
||||||
return _gst_gconf_client;
|
return _gst_gconf_client;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* go through a bin, finding the one pad that is unconnected in the given
|
/* go through a bin, finding the one pad that is unconnected in the given
|
||||||
* * direction, and return that pad */
|
* * direction, and return that pad */
|
||||||
GstPad *
|
static GstPad *
|
||||||
gst_bin_find_unconnected_pad (GstBin *bin, GstPadDirection direction)
|
gst_bin_find_unconnected_pad (GstBin *bin, GstPadDirection direction)
|
||||||
{
|
{
|
||||||
GstPad *pad = NULL;
|
GstPad *pad = NULL;
|
||||||
|
@ -117,10 +118,11 @@ gst_gconf_render_bin_from_description (const gchar *description)
|
||||||
GstElement *
|
GstElement *
|
||||||
gst_gconf_render_bin_from_key (const gchar *key)
|
gst_gconf_render_bin_from_key (const gchar *key)
|
||||||
{
|
{
|
||||||
GstElement *bin;
|
GstElement *bin = NULL;
|
||||||
gchar *value;
|
gchar *value;
|
||||||
|
|
||||||
value = gst_gconf_get_string (key);
|
value = gst_gconf_get_string (key);
|
||||||
|
if (value)
|
||||||
bin = gst_gconf_render_bin_from_description (value);
|
bin = gst_gconf_render_bin_from_description (value);
|
||||||
return bin;
|
return bin;
|
||||||
}
|
}
|
||||||
|
@ -131,6 +133,40 @@ guint gst_gconf_notify_add (const gchar *key,
|
||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
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 ("osssink", NULL);
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
g_warning ("No GConf default audio sink key and osssink doesn't work");
|
||||||
|
else
|
||||||
|
g_warning ("GConf audio sink not found, using osssink");
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 ("xvideosink", NULL);
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
g_warning ("No GConf default video sink key and xvideosink doesn't work");
|
||||||
|
else
|
||||||
|
g_warning ("GConf video sink not found, using xvideosink");
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
plugin_init (GModule *module, GstPlugin *plugin)
|
plugin_init (GModule *module, GstPlugin *plugin)
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,6 +15,9 @@ void gst_gconf_set_string (const gchar *key,
|
||||||
GstElement * gst_gconf_render_bin_from_key (const gchar *key);
|
GstElement * gst_gconf_render_bin_from_key (const gchar *key);
|
||||||
GstElement * gst_gconf_render_bin_from_description (const gchar *description);
|
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);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
guint gst_gconf_notify_add (const gchar *key,
|
guint gst_gconf_notify_add (const gchar *key,
|
||||||
GConfClientNotifyFunc func,
|
GConfClientNotifyFunc func,
|
||||||
|
|
Loading…
Reference in a new issue