Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-fixed issue where music started too early. Now it sends the play request at the correct instance, but the music is now 5 seconds late. Suspect some kind of buffering between icecast and liquidsoap

This commit is contained in:
mkonecny 2011-01-10 17:10:18 -05:00
parent 5ffb9c36a2
commit 46cce0ed3a
1 changed files with 27 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
pypo/pypo-cli.py
View File

@ -92,7 +92,8 @@ logging.config.fileConfig("logging.cfg")
try: try:
config = ConfigObj('config.cfg') config = ConfigObj('config.cfg')
POLL_INTERVAL = float(config['poll_interval']) POLL_INTERVAL = float(config['poll_interval'])
PUSH_INTERVAL = float(config['push_interval']) PUSH_INTERVAL = 0.5
#PUSH_INTERVAL = float(config['push_interval'])
LS_HOST = config['ls_host'] LS_HOST = config['ls_host']
LS_PORT = config['ls_port'] LS_PORT = config['ls_port']
except Exception, e: except Exception, e:
@ -109,9 +110,6 @@ class Global:
sys.exit() sys.exit()
"""
"""
class Playout: class Playout:
def __init__(self): def __init__(self):
self.api_client = api_client.api_client_factory(config) self.api_client = api_client.api_client_factory(config)
@ -577,47 +575,41 @@ class Playout:
self.schedule = self.load_schedule() self.schedule = self.load_schedule()
playedItems = self.load_schedule_tracker() playedItems = self.load_schedule_tracker()
tcomming = time.localtime(time.time() + self.push_ahead) tcoming = time.localtime(time.time() + self.push_ahead)
tnow = time.localtime(time.time()) tnow = time.localtime(time.time())
str_tnow = "%04d-%02d-%02d-%02d-%02d" % (tnow[0], tnow[1], tnow[2], tnow[3], tnow[4]) str_tcoming_s = "%04d-%02d-%02d-%02d-%02d-%02d" % (tcoming[0], tcoming[1], tcoming[2], tcoming[3], tcoming[4], tcoming[5])
str_tnow_s = "%04d-%02d-%02d-%02d-%02d-%02d" % (tnow[0], tnow[1], tnow[2], tnow[3], tnow[4], tnow[5])
str_tcomming = "%04d-%02d-%02d-%02d-%02d" % (tcomming[0], tcomming[1], tcomming[2], tcomming[3], tcomming[4])
str_tcomming_s = "%04d-%02d-%02d-%02d-%02d-%02d" % (tcomming[0], tcomming[1], tcomming[2], tcomming[3], tcomming[4], tcomming[5])
playnow = None
if self.schedule == None: if self.schedule == None:
logger.warn('Unable to loop schedule - maybe write in progress?') logger.warn('Unable to loop schedule - maybe write in progress?')
logger.warn('Will try again in next loop.') logger.warn('Will try again in next loop.')
else: else:
for pkey in self.schedule: for pkey in self.schedule:
if pkey[0:16] == str_tcomming: playedFlag = (pkey in playedItems) and playedItems[pkey].get("played", 0)
if pkey[0:19] <= str_tcoming_s and not playedFlag:
logger.debug('Preparing to push playlist scheduled at: %s', pkey) logger.debug('Preparing to push playlist scheduled at: %s', pkey)
playlist = self.schedule[pkey] playlist = self.schedule[pkey]
playedFlag = (pkey in playedItems) and playedItems[pkey].get("played", 0)
logger.debug("PLAYED FLAG: " + str(playedFlag)) ptype = playlist['subtype']
if not playedFlag:
# We have a match, replace the current playlist and
# force liquidsoap to refresh.
ptype = playlist['subtype']
if (self.push_liquidsoap(pkey, self.schedule, ptype) == 1): # We have a match, replace the current playlist and
logger.debug("Pushed to liquidsoap, updating 'played' status.") # force liquidsoap to refresh.
# Marked the current playlist as 'played' in the schedule tracker if (self.push_liquidsoap(pkey, self.schedule, ptype) == 1):
# so it is not called again in the next push loop. logger.debug("Pushed to liquidsoap, updating 'played' status.")
# Write changes back to tracker file. # Marked the current playlist as 'played' in the schedule tracker
playedItems[pkey] = playlist # so it is not called again in the next push loop.
playedItems[pkey]['played'] = 1 # Write changes back to tracker file.
schedule_tracker = open(self.schedule_tracker_file, "w") playedItems[pkey] = playlist
pickle.dump(playedItems, schedule_tracker) playedItems[pkey]['played'] = 1
schedule_tracker.close() schedule_tracker = open(self.schedule_tracker_file, "w")
logger.debug("Wrote schedule to disk: "+str(playedItems)) pickle.dump(playedItems, schedule_tracker)
schedule_tracker.close()
# Call API to update schedule states logger.debug("Wrote schedule to disk: "+str(playedItems))
logger.debug("Doing callback to server to update 'played' status.")
self.api_client.notify_scheduled_item_start_playing(pkey, self.schedule) # Call API to update schedule states
logger.debug("Doing callback to server to update 'played' status.")
self.api_client.notify_scheduled_item_start_playing(pkey, self.schedule)
def load_schedule(self): def load_schedule(self):
@ -725,80 +717,6 @@ class Playout:
return status return status
#def push_liquidsoap_legacy(self, pkey, ptype, p_id, user_id):
# logger = logging.getLogger()
# logger.debug('trying to push %s to liquidsoap', pkey)
#
# self.export_source = export_source
# self.cache_dir = CACHE_DIR + self.export_source + '/'
# self.schedule_file = self.cache_dir + 'schedule'
#
# src = self.cache_dir + str(pkey) + '/list.lsp'
# dst = self.cache_dir + 'current.lsp'
#
# print src
# print dst
#
# print '*************'
# print ptype
# print '*************'
#
# if True == os.access(src, os.R_OK):
# try:
# shutil.copy2(src, dst)
# logger.debug('copy %s to %s', src, dst)
# """
# i know this could be wrapped, maybe later..
# """
# tn = telnetlib.Telnet(LS_HOST, 1234)
# tn.write("\n")
# tn.write("live_in.stop\n")
# tn.write("stream_disable\n")
# time.sleep(0.2)
# tn.write("\n")
# #tn.write("reload_current\n")
# tn.write("current.reload\n")
# time.sleep(0.2)
# tn.write("skip_current\n")
#
# if(int(ptype) == 6):
# """
# Couchcaster comming. Stop/Start live input to have ls re-read it's playlist
# """
# print 'Couchcaster - switching to stream'
# tn.write("live_in.start\n")
# time.sleep(0.2)
# tn.write("stream_enable\n")
#
# if(int(ptype) == 7):
# """
# Recast comming. Start the live input
# """
# print 'Recast - switching to stream'
# tn.write("live_in.start\n")
# time.sleep(0.2)
# tn.write("stream_enable\n")
#
# """
# Pass some extra information to liquidsoap
# """
# tn.write("pl.pl_id '%s'\n" % p_id)
# tn.write("pl.user_id '%s'\n" % user_id)
# tn.write("exit\n")
#
# print tn.read_all()
#
# status = 1
#
# except Exception, e:
# logger.error('%s', e)
# status = 0
# else:
# status = 0
#
# return status
""" """
Updates the jingles. Give comma separated list of jingle tracks. Updates the jingles. Give comma separated list of jingle tracks.