[Telepathy-commits] [mingle/master] Use gconf audio/videosources by default

[Sjoerd Simons]

---
 fs2.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fs2.py b/fs2.py
index 744d7c0..b87e2e0 100644
--- a/fs2.py
+++ b/fs2.py
@@ -108,8 +108,11 @@ class VideoSource(gst.Bin):
 class AudioSource(gst.Bin):
     def __init__(self):
         gst.Bin.__init__(self)
-        source = gst.element_factory_make("audiotestsrc")
-        source.set_property("is-live", True)
+        if os.environ.has_key("TESTAUDIO"):
+            source = gst.element_factory_make("audiotestsrc")
+            source.set_property("is-live", True)
+        else:
+            source = gst.element_factory_make("gconfaudiosrc")
         self.add(source)
         pad = gst.GhostPad("src", source.get_pad("src"))
         self.add_pad(pad)
@@ -144,10 +147,10 @@ class ConferenceStream:
 
     def default_src_pad_added (self, session, stream, pad, codec):
         if self.session.type == farsight.MEDIA_TYPE_VIDEO:
-            sink = gst.element_factory_make("xvimagesink")
+            sink = gst.element_factory_make("gconfvideosink")
 
         elif self.session.type == farsight.MEDIA_TYPE_AUDIO:
-            sink = gst.element_factory_make("autoaudiosink")
+            sink = gst.element_factory_make("gconfaudiosink")
 
         self.add_sink(sink)
         self.conference.add(sink)
-- 
1.5.6.5