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

Merge pull request #24 from blaenk/rewind-option

Browse Source 
added a rewind on desync option
This commit is contained in:
Etoh 2013-07-01 12:27:12 -07:00
commit 89ba7561d9
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/client.py
View File

@ -209,7 +209,7 @@ class SyncplayClient(object):
self._lastGlobalUpdate = time.time() self._lastGlobalUpdate = time.time()
if (doSeek): if (doSeek):
madeChangeOnPlayer = self._serverSeeked(position, setBy) madeChangeOnPlayer = self._serverSeeked(position, setBy)
if (diff > constants.REWIND_THRESHOLD and not doSeek): if (diff > constants.REWIND_THRESHOLD and not doSeek and not self._config['rewindOnDesync'] == False):
madeChangeOnPlayer = self._rewindPlayerDueToTimeDifference(position, setBy) madeChangeOnPlayer = self._rewindPlayerDueToTimeDifference(position, setBy)
if (self._player.speedSupported and not doSeek and not paused and not self._config['slowOnDesync'] == False): if (self._player.speedSupported and not doSeek and not paused and not self._config['slowOnDesync'] == False):
madeChangeOnPlayer = self._slowDownToCoverTimeDifference(diff, setBy) madeChangeOnPlayer = self._slowDownToCoverTimeDifference(diff, setBy)

6
syncplay/ui/ConfigurationGetter.py
View File

@ -34,6 +34,7 @@ class ConfigurationGetter(object):
"playerArgs": [], "playerArgs": [],
"playerClass": None, "playerClass": None,
"slowOnDesync": True, "slowOnDesync": True,
"rewindOnDesync": True,
"malUsername": "", "malUsername": "",
"malPassword": "" "malPassword": ""
} }
@ -55,12 +56,13 @@ class ConfigurationGetter(object):
"forceGuiPrompt", "forceGuiPrompt",
"noGui", "noGui",
"noStore", "noStore",
"slowOnDesync" "slowOnDesync",
"rewindOnDesync"
] ]
self._iniStructure = { self._iniStructure = {
"server_data": ["host", "port", "password"], "server_data": ["host", "port", "password"],
"client_settings": ["name", "room", "playerPath", "slowOnDesync", "forceGuiPrompt"], "client_settings": ["name", "room", "playerPath", "slowOnDesync", "rewindOnDesync", "forceGuiPrompt"],
"mal": ["malPassword", "malUsername"] "mal": ["malPassword", "malUsername"]
} }

8
syncplay/ui/GuiConfiguration.py
View File

@ -169,6 +169,10 @@ class ConfigDialog(QtGui.QDialog):
self.config['slowOnDesync'] = True self.config['slowOnDesync'] = True
else: else:
self.config['slowOnDesync'] = False self.config['slowOnDesync'] = False
if self.rewindCheckbox.isChecked() == True:
self.config['rewindOnDesync'] = True
else:
self.config['rewindOnDesync'] = False
self.config['malUsername'] = self.malusernameTextbox.text() self.config['malUsername'] = self.malusernameTextbox.text()
if self.malSettingsGroup.isChecked(): if self.malSettingsGroup.isChecked():
self.config['malPassword'] = self.malpasswordTextbox.text() self.config['malPassword'] = self.malpasswordTextbox.text()
@ -261,6 +265,7 @@ class ConfigDialog(QtGui.QDialog):
self.mediabrowseButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + 'folder_explore.png'),"Browse") self.mediabrowseButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + 'folder_explore.png'),"Browse")
self.mediabrowseButton.clicked.connect(self.browseMediapath) self.mediabrowseButton.clicked.connect(self.browseMediapath)
self.slowdownCheckbox = QCheckBox("Slow down on desync") self.slowdownCheckbox = QCheckBox("Slow down on desync")
self.rewindCheckbox = QCheckBox("Rewind on desync")
self.mediaplayerSettingsLayout = QtGui.QGridLayout() self.mediaplayerSettingsLayout = QtGui.QGridLayout()
self.mediaplayerSettingsLayout.addWidget(self.executablepathLabel, 0, 0) self.mediaplayerSettingsLayout.addWidget(self.executablepathLabel, 0, 0)
self.mediaplayerSettingsLayout.addWidget(self.executablepathCombobox , 0, 1) self.mediaplayerSettingsLayout.addWidget(self.executablepathCombobox , 0, 1)
@ -269,9 +274,12 @@ class ConfigDialog(QtGui.QDialog):
self.mediaplayerSettingsLayout.addWidget(self.mediapathTextbox , 1, 1) self.mediaplayerSettingsLayout.addWidget(self.mediapathTextbox , 1, 1)
self.mediaplayerSettingsLayout.addWidget(self.mediabrowseButton , 1, 2) self.mediaplayerSettingsLayout.addWidget(self.mediabrowseButton , 1, 2)
self.mediaplayerSettingsLayout.addWidget(self.slowdownCheckbox, 2, 0) self.mediaplayerSettingsLayout.addWidget(self.slowdownCheckbox, 2, 0)
self.mediaplayerSettingsLayout.addWidget(self.rewindCheckbox, 3, 0)
self.mediaplayerSettingsGroup.setLayout(self.mediaplayerSettingsLayout) self.mediaplayerSettingsGroup.setLayout(self.mediaplayerSettingsLayout)
if config['slowOnDesync'] == True: if config['slowOnDesync'] == True:
self.slowdownCheckbox.setChecked(True) self.slowdownCheckbox.setChecked(True)
if config['rewindOnDesync'] == True:
self.rewindCheckbox.setChecked(True)
self.malSettingsGroup = QtGui.QGroupBox("Enable MyAnimeList updater (EXPERIMENTAL)") self.malSettingsGroup = QtGui.QGroupBox("Enable MyAnimeList updater (EXPERIMENTAL)")
self.malSettingsGroup.setCheckable(True) self.malSettingsGroup.setCheckable(True)