a no-brainer addition

Original commit message from CVS:
a no-brainer addition

diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index f14a0a6c7e89281a33f278d12732d772b7877a78..c3b0d4cf31905e16aaf2f5c4db7932b95a50c92a 100644 (file)
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -167,6 +167,40 @@ gst_gconf_get_default_video_sink (void)
   return ret;
 }
 
+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 ("osssrc", NULL);
+  
+    if (!ret)
+      g_warning ("No GConf default audio src key and osssrc doesn't work");
+    else
+      g_warning ("GConf audio src not found, using osssrc");
+  }
+
+  return ret;
+}
+
+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 ("videotestsrc", NULL);
+  
+    if (!ret)
+      g_warning ("No GConf default video src key and videotestrc doesn't work");
+    else
+      g_warning ("GConf video src not found, using videotestrc");
+  }
+
+  return ret;
+}
+
 static gboolean
 plugin_init (GModule *module, GstPlugin *plugin)
 {

diff --git a/gst-libs/gst/gconf/gconf.h b/gst-libs/gst/gconf/gconf.h
index c1ed9d420795a393a3b3c5164d16b1ea1ea7805b..4444b5fee751c64572ec1795f1a46e3a8b50fdcd 100644 (file)
--- a/gst-libs/gst/gconf/gconf.h
+++ b/gst-libs/gst/gconf/gconf.h
@@ -17,6 +17,8 @@ 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);
 
 /*
 guint          gst_gconf_notify_add            (const gchar *key,

diff --git a/gst-libs/gst/gconf/test-gconf.c b/gst-libs/gst/gconf/test-gconf.c
index 25831d9473369818027cdd26c5b171681231a395..5f9c398ba28b65c0f9d586276a44e5006fe20b56 100644 (file)
--- a/gst-libs/gst/gconf/test-gconf.c
+++ b/gst-libs/gst/gconf/test-gconf.c
@@ -7,5 +7,9 @@ main (int argc, char *argv[])
           gst_gconf_get_string ("default/videosink"));
   printf ("Default audio sink : %s\n", 
           gst_gconf_get_string ("default/audiosink"));
+  printf ("Default video src : %s\n", 
+          gst_gconf_get_string ("default/videosrc"));
+  printf ("Default audio src : %s\n", 
+          gst_gconf_get_string ("default/audiosrc"));
   return 0;
 }