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

CC-1665: Scheduled stream rebroadcasting and recording

Browse source 
-info about current pre-buffering webstream should be persistent...
This commit is contained in:
Martin Konecny 2012-08-17 17:10:42 -04:00
parent 284b028521
commit b3ef67e617
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python_apps/pypo/pypopush.py
View file

@ -50,6 +50,7 @@ class PypoPush(Thread):
self.pushed_objects = {}
self.logger = logging.getLogger('push')
self.current_stream_info = None
self.current_prebuffering_stream_id = None
def main(self):
loops = 0
@ -389,7 +390,7 @@ class PypoPush(Thread):
elif media_item['type'] == 'stream_buffer_start':
self.start_web_stream_buffer(media_item)
elif media_item['type'] == "stream":
if not media_item['prebuffer_started']:
if media_item['row_id'] != self.current_prebuffering_stream_id
#this is called if the stream wasn't scheduled sufficiently ahead of time
#so that the prebuffering stage could take effect. Let's do the prebuffering now.
self.start_web_stream_buffer(media_item)
@ -416,7 +417,7 @@ class PypoPush(Thread):
tn.write("exit\n")
self.logger.debug(tn.read_all())
media_item['prebuffer_started'] = True
self.current_prebuffering_stream_id = media_item['row_id']
except Exception, e:
self.logger.error(str(e))
finally:
@ -441,6 +442,7 @@ class PypoPush(Thread):
tn.write("exit\n")
self.logger.debug(tn.read_all())
self.current_prebuffering_stream_id = None
self.current_stream_info = media_item
except Exception, e:
self.logger.error(str(e))