Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto-play after playlist advances

Browse Source
This commit is contained in:
Etoh 2016-10-17 14:02:06 +01:00 committed by GitHub
parent 82adb4c592
commit e295b8ad41
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syncplay/client.py
View File

@ -480,6 +480,7 @@ class SyncplayClient(object):
if resetPosition: if resetPosition:
self.establishRewindDoubleCheck() self.establishRewindDoubleCheck()
self.lastRewindTime = time.time() self.lastRewindTime = time.time()
self.autoplayCheck()
def fileSwitchFoundFiles(self): def fileSwitchFoundFiles(self):
self.ui.fileSwitchFoundFiles() self.ui.fileSwitchFoundFiles()
@ -693,9 +694,10 @@ class SyncplayClient(object):
return False return False
def autoplayConditionsMet(self): def autoplayConditionsMet(self):
return self._playerPaused and self.autoPlay and self.userlist.currentUser.canControl() and self.userlist.isReadinessSupported()\ recentlyReset = (self.lastRewindTime is not None and abs(time.time() - self.lastRewindTime) < 10) and self._playerPosition < 3
return self._playerPaused and (self.autoPlay or recentlyReset) and self.userlist.currentUser.canControl() and self.userlist.isReadinessSupported()\
and self.userlist.areAllUsersInRoomReady(requireSameFilenames=self._config["autoplayRequireSameFilenames"])\ and self.userlist.areAllUsersInRoomReady(requireSameFilenames=self._config["autoplayRequireSameFilenames"])\
and self.autoPlayThreshold and self.userlist.usersInRoomCount() >= self.autoPlayThreshold and ((self.autoPlayThreshold and self.userlist.usersInRoomCount() >= self.autoPlayThreshold) or recentlyReset)
def autoplayTimerIsRunning(self): def autoplayTimerIsRunning(self):
return self.autoplayTimer.running return self.autoplayTimer.running
@ -1768,4 +1770,4 @@ class FileSwitchManager(object):
if self.isDirectoryInList(directoryToFind, self.mediaDirectories): if self.isDirectoryInList(directoryToFind, self.mediaDirectories):
return return
self._client.ui.showErrorMessage(getMessage("added-file-not-in-media-directory-error").format(directoryToFind)) self._client.ui.showErrorMessage(getMessage("added-file-not-in-media-directory-error").format(directoryToFind))
self.mediaDirectoriesNotFound.append(directoryToFind) self.mediaDirectoriesNotFound.append(directoryToFind)