[Telepathy-commits] [mingle/master] Use the new way of discovering farsight transmitters

[Sjoerd Simons]

---
 fs2.py    |    5 +++++
 jingle.py |   11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs2.py b/fs2.py
index 78543c6..1c976a9 100644
--- a/fs2.py
+++ b/fs2.py
@@ -342,3 +342,8 @@ class Conference(gst.Pipeline):
         elif element.get_factory().get_name() == "gstrtpbin":
             element.set_property("latency", 100)
 
+
+def get_available_transmitters():
+    conf =  gst.element_factory_make("fsrtpconference")
+    session = conf.new_session(farsight.MEDIA_TYPE_VIDEO)
+    return session.list_transmitters()
diff --git a/jingle.py b/jingle.py
index 0e0d07e..b513401 100644
--- a/jingle.py
+++ b/jingle.py
@@ -155,15 +155,10 @@ def get_available_transports():
     """ Get the list of available tranports (by namespace) depending on the
         available farsight transmitters
      """
-    return [ ns.JINGLE_TRANSPORT_RAW_UDP, ns.GOOGLE_TRANSPORT_P2P ]
-
-    transports = []
     mapping = { "rawudp": [ ns.JINGLE_TRANSPORT_RAW_UDP ],
-                "nice": [ ns.GOOGLE_TRANSPORT_P2P] }
-    try:
-        transmitters = farsight.list_available_rtp_transmitters()
-    except Exception:
-        transmitters = ("rawudp",)
+                "nice": [ ns.GOOGLE_TRANSPORT_P2P ] }
+    transmitters = fs2.get_available_transmitters()
+    transports = []
 
     for t in transmitters:
         if mapping.has_key(t):
-- 
1.5.6.5