all translated: please check the diff and correct the strings (rc and

[vlc] / python / vlrs / rtsp.py

diff --git a/python/vlrs/rtsp.py b/python/vlrs/rtsp.py
index b44ac379538646f9511873fedf65ef21bd70c89e..72357613de22210d629c472eff4158dba0287da1 100755 (executable)
--- a/python/vlrs/rtsp.py
+++ b/python/vlrs/rtsp.py
@@ -10,37 +10,7 @@
 
 import cfg, mimetools, re, socket, time, SocketServer, string, sys
 
-
-def ntpTime():
-    "return the current time in NTP decimal format"
-    return "%d" % (int(time.time()) + 2208988800L)
-
-
-
-class SdpMessage:
-    "Build a SDP message"
- 
-    uri = "http://www.videolan.org"
-
-    def __init__(self, sessionName, address, uri):
-        "Build the message"
-        self.sessionName = sessionName
-        self.address = address
-        self.uri = uri
-        
-    def getMessage(self):
-        "Return the SDP message"
-        msg = "v=0\r\n" + \
-              "o=asmax " + ntpTime() + " " + ntpTime() + \
-                  " IN IP4 sphinx.via.ecp.fr\r\n" + \
-              "s=" + self.sessionName + "\r\n" + \
-              "u=" + self.uri + "\r\n" + \
-              "t=0 0\r\n" + \
-              "c=IN IP4 " + self.address + "/1\r\n" + \
-              "m=video 1234 RTP/MP2T 33\r\n" + \
-              "a=control:" + self.uri + "\r\n"
-        return msg
-
+from sap import SdpMessage
 
 
 class RtspServerHandler(SocketServer.StreamRequestHandler):
@@ -48,12 +18,12 @@ class RtspServerHandler(SocketServer.StreamRequestHandler):
     
     version = "RTSP/1.0"
     ok = "200 OK"
-    badRequest = "400 Bad Request"
+    badRequest = "400 Bad request"
     uriNotFound = "404 Not found"
-    sessionNotFound = "454 Session Not Found"
-    invalidHeader = "456 Header Field Not Valid for Resource"
-    internalError = "500 Internal Server Error"
-    notImplemented = "501 Not Implemented"
+    sessionNotFound = "454 Session not found"
+    invalidHeader = "456 Header field not valid for resource"
+    internalError = "500 Internal server error"
+    notImplemented = "501 Not implemented"
     
     def error(self, message, cseq):
         self.wfile.write(self.version + " " + message + "\r\n" + \
@@ -78,7 +48,7 @@ class RtspServerHandler(SocketServer.StreamRequestHandler):
         return response
 
     def pingMethod(self, msg):
-        "Handle an PING request"
+        "Handle a PING request"
         cseq = msg.getheader('cseq')
         id = msg.getheader('Session')
         if id is None: