Play-all removes the previous files in queue

2016-03-26 22:14:12 -06:00 · 2016-03-26 22:14:12 -06:00 · 66d2897650
commit 66d2897650
parent b944700198
1 changed files with 4 additions and 5 deletions
--- a/src/controller/player.py
+++ b/src/controller/player.py
@ -74,13 +74,12 @@ class audioPlayer(object):
 			self.stream.volume = self.vol/100.0

 	def play_all(self, list_of_urls):
-		if len(self.queue) == 0:
 		self.queue = list_of_urls
-		else:
-			for i in list_of_urls:
-				self.queue.append(i)
 		self.play(self.queue[0])
 		self.queue.remove(self.queue[0])
+		if hasattr(self, "worker") and self.worker != None:
+			self.worker.cancel()
+			self.worker = None
 		self.worker = RepeatingTimer(5, self.player_function)
 		self.worker.start()