Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-4487: Webstream could not be heard unless you restart playout as well 

-cleanup of unused variables
This commit is contained in:
Martin Konecny 2012-10-19 16:49:01 -04:00
parent bd5fef0bcd
commit ef78cefcd9
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python_apps/pypo/pypopush.py
View File

@ -55,7 +55,6 @@ class PypoPush(Thread):
self.pushed_objects = {} self.pushed_objects = {}
self.logger = logging.getLogger('push') self.logger = logging.getLogger('push')
self.current_stream_info = None
self.current_prebuffering_stream_id = None self.current_prebuffering_stream_id = None
def main(self): def main(self):
@ -198,7 +197,7 @@ class PypoPush(Thread):
def is_correct_current_item(self, media_item, liquidsoap_queue_approx, liquidsoap_stream_id): def is_correct_current_item(self, media_item, liquidsoap_queue_approx, liquidsoap_stream_id):
correct = False correct = False
if media_item is None: if media_item is None:
correct = (len(liquidsoap_queue_approx) == 0 and self.current_stream_info is None) correct = (len(liquidsoap_queue_approx) == 0 and liquidsoap_stream_id == "-1")
else: else:
if is_file(media_item): if is_file(media_item):
if len(liquidsoap_queue_approx) == 0: if len(liquidsoap_queue_approx) == 0:
@ -230,7 +229,6 @@ class PypoPush(Thread):
file_chain = filter(lambda item: (item["type"] == "file"), current_event_chain) file_chain = filter(lambda item: (item["type"] == "file"), current_event_chain)
stream_chain = filter(lambda item: (item["type"] == "stream_output_start"), current_event_chain) stream_chain = filter(lambda item: (item["type"] == "stream_output_start"), current_event_chain)
self.logger.debug(self.current_stream_info)
self.logger.debug(current_event_chain) self.logger.debug(current_event_chain)
#Take care of the case where the current playing may be incorrect #Take care of the case where the current playing may be incorrect
@ -507,7 +505,6 @@ class PypoPush(Thread):
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
self.current_prebuffering_stream_id = None self.current_prebuffering_stream_id = None
self.current_stream_info = media_item
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))
finally: finally:
@ -533,7 +530,6 @@ class PypoPush(Thread):
tn.write("exit\n") tn.write("exit\n")
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
self.current_stream_info = None
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))
finally: finally:
@ -556,7 +552,6 @@ class PypoPush(Thread):
tn.write("exit\n") tn.write("exit\n")
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
self.current_stream_info = None
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))
finally: finally:
@ -575,7 +570,6 @@ class PypoPush(Thread):
tn.write("exit\n") tn.write("exit\n")
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
self.current_stream_info = None
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))
finally: finally: