winlin

update server.py

@@ -329,9 +329,17 @@ class RESTServers(object): @@ -329,9 +329,17 @@ class RESTServers(object):
329 def __init__(self): 329 def __init__(self):
330 self.__server_ip = "192.168.1.142"; 330 self.__server_ip = "192.168.1.142";
331 331
332 - def GET(self): 332 + '''
  333 + id canbe:
  334 + ingest: the ingest demo.
  335 + meeting: the meeting demo.
  336 + '''
  337 + def GET(self, id=None):
333 enable_crossdomain() 338 enable_crossdomain()
334 - url = "http://%s:8080/live/livestream.html"%(self.__server_ip) 339 + if id == "meeting"
  340 + url = "http://%s:8085/players/srs_chat.html?port=1935"%(self.__server_ip)
  341 + else:
  342 + url = "http://%s:8080/live/livestream.html"%(self.__server_ip)
335 raise cherrypy.HTTPRedirect(url) 343 raise cherrypy.HTTPRedirect(url)
336 344
337 def POST(self): 345 def POST(self):