ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tracklisting start timer not clearing.

Browse source
This commit is contained in:
Matthew Stratford 2021-09-01 23:23:50 +01:00
parent be885d87e4
commit 1de449fe0c
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
player.py
View file

@ -665,6 +665,7 @@ class Player:
if self.tracklist_end_timer: if self.tracklist_end_timer:
self.logger.log.error("Failed to potentially end tracklist, timer already busy.") self.logger.log.error("Failed to potentially end tracklist, timer already busy.")
return return
self.state.update("tracklist_id", None)
# This threads it, so it won't hang track loading if it fails. # This threads it, so it won't hang track loading if it fails.
self.tracklist_end_timer = Timer(1, self._tracklist_end, [tracklist_id]) self.tracklist_end_timer = Timer(1, self._tracklist_end, [tracklist_id])
self.tracklist_end_timer.start() self.tracklist_end_timer.start()
@ -676,28 +677,29 @@ class Player:
loaded_item = state["loaded_item"] loaded_item = state["loaded_item"]
if not loaded_item: if not loaded_item:
self.logger.log.error("Tried to call _tracklist_start() with no loaded item!") self.logger.log.error("Tried to call _tracklist_start() with no loaded item!")
return
if not self.isPlaying: elif not self.isPlaying:
self.logger.log.info("Not tracklisting since not playing.") self.logger.log.info("Not tracklisting since not playing.")
return
tracklist_id = state["tracklist_id"]
if (not tracklist_id):
if (state["tracklist_mode"] == "fader-live" and not state["live"]):
self.logger.log.info("Not tracklisting since fader is not live.")
else:
self.logger.log.info("Tracklisting item: {}".format(loaded_item.name))
tracklist_id = self.api.post_tracklist_start(loaded_item)
if not tracklist_id:
self.logger.log.warning("Failed to tracklist {}".format(loaded_item.name))
else:
self.logger.log.info("Tracklist id: {}".format(tracklist_id))
self.state.update("tracklist_id", tracklist_id)
else: else:
self.logger.log.info("Not tracklisting item {}, already got tracklistid: {}".format(
loaded_item.name, tracklist_id))
tracklist_id = state["tracklist_id"]
if (not tracklist_id):
if (state["tracklist_mode"] == "fader-live" and not state["live"]):
self.logger.log.info("Not tracklisting since fader is not live.")
else:
self.logger.log.info("Tracklisting item: {}".format(loaded_item.name))
tracklist_id = self.api.post_tracklist_start(loaded_item)
if not tracklist_id:
self.logger.log.warning("Failed to tracklist {}".format(loaded_item.name))
else:
self.logger.log.info("Tracklist id: {}".format(tracklist_id))
self.state.update("tracklist_id", tracklist_id)
else:
self.logger.log.info("Not tracklisting item {}, already got tracklistid: {}".format(
loaded_item.name, tracklist_id))
# No matter what we end up doing, we need to kill this timer so future ones can run.
self.tracklist_start_timer = None self.tracklist_start_timer = None
def _tracklist_end(self, tracklist_id): def _tracklist_end(self, tracklist_id):