[vlma-devel] commit: SAP handling for VLC. (Adrien Maglo )

[git version control]

vlma | branch: master | Adrien Maglo <magsoft at videolan.org> | Wed Dec 30 15:03:57 2009 +0100| [7503a8e3647f68f85c374fac1573f5c77210a29f] | committer: Adrien Maglo 

SAP handling for VLC.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=7503a8e3647f68f85c374fac1573f5c77210a29f
---

 vlma-watchdog/src/streamer/vlc.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vlma-watchdog/src/streamer/vlc.py b/vlma-watchdog/src/streamer/vlc.py
index 4f912f3..c8d752e 100644
--- a/vlma-watchdog/src/streamer/vlc.py
+++ b/vlma-watchdog/src/streamer/vlc.py
@@ -82,11 +82,16 @@ class VLC(Streamer):
 
   def _destToSoutStr(self, dest):
     if dest.streaming.protocol == "udp":
-      ret = "dst=standard{mux=%s,access=%s,dst=%s:%d}" \
+      ret = "dst=standard{mux=%s,access=%s,dst=%s:%d" \
           % (dest.streaming.mux, dest.streaming.protocol, dest.ip, dest.port)
     elif dest.streaming.protocol == "rtp":
-      ret = "dst=rtp{mux=%s,dst=%s,port=%d}" \
+      ret = "dst=rtp{mux=%s,dst=%s,port=%d" \
           % (dest.streaming.mux, dest.ip, dest.port)
+    if not dest.announcing is None and dest.announcing.type == "sap":
+      ret += ",sap,name=\"%s\"" % (dest.announcing.name)
+      if not dest.announcing.group is None:
+        ret += ",group=\"%s\"" % (dest.announcing.group)
+    ret += "}"
     return ret
 
   def _connectToVLC(self):