X-Git-Url: https://git.rvb.name/vpproxy.git/blobdiff_plain/1aebc74d991c35b7eb82395434d543d44f536089..c5401ae7940c77b3f65eaccfee8493c61478b579:/vlcclient/vlcclient.py diff --git a/vlcclient/vlcclient.py b/vlcclient/vlcclient.py index 80fc0f7..9492156 100644 --- a/vlcclient/vlcclient.py +++ b/vlcclient/vlcclient.py @@ -9,7 +9,6 @@ import telnetlib import logging from vlcmessages import * import time -from pprint import pprint class VlcException(Exception): @@ -181,13 +180,22 @@ class VlcClient(object): self._resultlock.acquire() to_stop=set() for stream,lasttime in self.streams.iteritems(): - print stream,lasttime if time.time()-lasttime>timeout: to_stop.add(stream) for stream in to_stop: - self.stopBroadcast(stream) + try: + self.stopBroadcast(stream) + except: + pass self._resultlock.release() + def check_stream(self,stream_name): + if stream_name in self.streams: + self.streams[stream_name]=time.time() + return True + else: + return False + def pauseBroadcast(self, stream_name): return self._write(VlcMessage.request.pauseBroadcast(stream_name))