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

CC-3840: Deleting current playing item sometimes results in random next track playing 

-possibly fixed
This commit is contained in:
Martin Konecny 2012-05-17 16:30:40 -04:00
parent f53a9c1811
commit b2c63544a9
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python_apps/pypo/airtime-playout-init-d
View File

@ -130,8 +130,8 @@ case "${1:-''}" in
'restart-liquidsoap')
# restart commands here
echo -n "Restarting Liquidsoap: "
stop-liquidsoap
start-liquidsoap
liquidsoap_stop
liquidsoap_start
echo "Done."
;;
'pypo-stop')

39
python_apps/pypo/pypopush.py
View File

@ -345,31 +345,28 @@ class PypoPush(Thread):
self.telnet_lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT)
# If the current playing item is to be removed, let's remove it last
# otherwise if we remove it first, the item after it that we also intend
# to remove will quickly slide into the current playing position. This seems
# to confuse Liquidsoap.
queue_copy = liquidsoap_queue_approx[::-1]
for queue_item in queue_copy:
msg = "queue.remove %s\n" % queue_item['queue_id']
self.logger.debug(msg)
tn.write(msg)
response = tn.read_until("\r\n").strip("\r\n")
if "No such request in my queue" in response:
"""
Cannot remove because Liquidsoap started playing the item. Need
to use source.skip instead
"""
msg = "source.skip\n"
self.logger.debug(msg)
tn.write(msg)
if problem_at_iteration == 0:
msg = "source.skip\n"
self.logger.debug(msg)
tn.write(msg)
else:
# Remove things in reverse order.
queue_copy = liquidsoap_queue_approx[::-1]
for queue_item in queue_copy:
msg = "queue.remove %s\n" % queue_item['queue_id']
self.logger.debug(msg)
tn.write(msg)
response = tn.read_until("\r\n").strip("\r\n")
if "No such request in my queue" in response:
"""
Cannot remove because Liquidsoap started playing the item. Need
to use source.skip instead
"""
msg = "source.skip\n"
self.logger.debug(msg)
tn.write(msg)
msg = "queue.queue\n"
self.logger.debug(msg)