mcvsoftware/music-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed function to get the next song automatically

Browse Source
This commit is contained in:
Manuel Cortez 2021-09-23 16:57:10 -05:00
parent 74d9b5b1a4
commit b60e62a56d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/controller/player.py
View File

@ -53,6 +53,8 @@ class audioPlayer(object):
if item.download_url == "": if item.download_url == "":
item.get_download_url() item.get_download_url()
log.debug("playing {0}...".format(item.download_url,)) log.debug("playing {0}...".format(item.download_url,))
if hasattr(self, "player") and self.player != None and self.player.is_playing:
self.player.stop()
self.player = stream.URLStream(item.download_url) self.player = stream.URLStream(item.download_url)
if self.player.play() == -1: if self.player.play() == -1:
log.debug("Error when playing the file {0}".format(item.title,)) log.debug("Error when playing the file {0}".format(item.title,))
@ -122,15 +124,11 @@ class audioPlayer(object):
""" Check if the stream has reached the end of the file so it will play the next song. """ """ Check if the stream has reached the end of the file so it will play the next song. """
if self.player != None and self.player.is_playing == False and self.stopped == False and len(self.player) == self.player.position: if self.player != None and self.player.is_playing == False and self.stopped == False and len(self.player) == self.player.position:
if self.queue_pos >= len(self.queue): if self.queue_pos >= len(self.queue):
self.stopped = True
self.playing_all = False
return
elif self.playing_all == False:
self.stopped = True self.stopped = True
return return
elif self.queue_pos < len(self.queue): elif self.queue_pos < len(self.queue):
self.queue_pos += 1 self.queue_pos += 1
self.play(self.queue[self.playing_track]) self.play(self.queue[self.queue_pos])
def playback_error(self, event): def playback_error(self, event):
pub.sendMessage("notify", title=_("Error"), message=_("There was an error while trying to access the file you have requested.")) pub.sendMessage("notify", title=_("Error"), message=_("There was an error while trying to access the file you have requested."))