Don't prepare to advance playlist if playlist can't be advanced
This commit is contained in:
parent
7f0ffb90d2
commit
7fe7639c56
@ -214,8 +214,11 @@ class SyncplayClient(object):
|
|||||||
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
|
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
|
||||||
|
|
||||||
def prepareToAdvancePlaylist(self):
|
def prepareToAdvancePlaylist(self):
|
||||||
self.ui.showDebugMessage("Preparing to advance playlist...")
|
if self.playlist.canSwitchToNextPlaylistIndex():
|
||||||
self._protocol.sendState(0, True, True, None, True)
|
self.ui.showDebugMessage("Preparing to advance playlist...")
|
||||||
|
self._protocol.sendState(0, True, True, None, True)
|
||||||
|
else:
|
||||||
|
self.ui.showDebugMessage("Not preparing to advance playlist because the next file cannot be switched to")
|
||||||
|
|
||||||
def _toggleReady(self, pauseChange, paused):
|
def _toggleReady(self, pauseChange, paused):
|
||||||
if not self.userlist.currentUser.canControl():
|
if not self.userlist.currentUser.canControl():
|
||||||
@ -1428,6 +1431,22 @@ class SyncplayPlaylist():
|
|||||||
self._ui.showMessage(getMessage("playlist-selection-changed-notification").format(username))
|
self._ui.showMessage(getMessage("playlist-selection-changed-notification").format(username))
|
||||||
self.switchToNewPlaylistIndex(index)
|
self.switchToNewPlaylistIndex(index)
|
||||||
|
|
||||||
|
def canSwitchToNextPlaylistIndex(self):
|
||||||
|
if self._thereIsNextPlaylistIndex() and self._client.sharedPlaylistIsEnabled():
|
||||||
|
try:
|
||||||
|
index = self._nextPlaylistIndex()
|
||||||
|
if index is None:
|
||||||
|
return False
|
||||||
|
filename = self._playlist[index]
|
||||||
|
if utils.isURL(filename):
|
||||||
|
return True if self._client.isURITrusted(filename) else False
|
||||||
|
else:
|
||||||
|
path = self._client.fileSwitch.findFilepath(filename, highPriority=True)
|
||||||
|
return True if path else False
|
||||||
|
except:
|
||||||
|
return False
|
||||||
|
return False
|
||||||
|
|
||||||
@needsSharedPlaylistsEnabled
|
@needsSharedPlaylistsEnabled
|
||||||
def switchToNewPlaylistIndex(self, index, resetPosition=False):
|
def switchToNewPlaylistIndex(self, index, resetPosition=False):
|
||||||
self._lastPlaylistIndexChange = time.time()
|
self._lastPlaylistIndexChange = time.time()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user