From 35c8ad78a228985e48e2d0a2d566957c39ff9cdd Mon Sep 17 00:00:00 2001 From: DonDavici Date: Thu, 30 Oct 2014 21:57:54 +0100 Subject: [PATCH] switched force subtitles to server settings --- src/DP_Server.py | 1 + src/DP_Settings.py | 1 - src/DP_View.py | 2 +- src/__init__.py | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DP_Server.py b/src/DP_Server.py index 279d19ac..e18aca70 100644 --- a/src/DP_Server.py +++ b/src/DP_Server.py @@ -426,6 +426,7 @@ def createSetup(self): elif self.current.playbackType.value == "2": self.useMappings = True + self.cfglist.append(getConfigListEntry(_("> Search and use forced subtitles"), self.current.useForcedSubtitles, _(" "))) elif self.current.playbackType.value == "3": self.useMappings = False diff --git a/src/DP_Settings.py b/src/DP_Settings.py index e18a6091..674fc600 100644 --- a/src/DP_Settings.py +++ b/src/DP_Settings.py @@ -113,7 +113,6 @@ def createSetup(self): self.cfglist.append(getConfigListEntry(_("> Use Cache for Sections"), config.plugins.dreamplex.useCache, _(" "))) self.cfglist.append(getConfigListEntry(_("> Use Picture Cache"), config.plugins.dreamplex.usePicCache, _("Use this if you do not have enough space on your box e.g. no hdd drive just flash."))) self.cfglist.append(getConfigListEntry(_("> Show Player Poster on external LCD"), config.plugins.dreamplex.lcd4linux, _("e.g. lcd4linux"))) - self.cfglist.append(getConfigListEntry(_("> Search and use forced subtitles"), config.plugins.dreamplex.useForcedSubtitles, _(" "))) if config.plugins.dreamplex.showUpdateFunction.value: self.cfglist.append(getConfigListEntry(_("> Check for updates on startup"), config.plugins.dreamplex.checkForUpdateOnStartup, _("If activated on each start we will check if there is a new version depending on your update type."))) diff --git a/src/DP_View.py b/src/DP_View.py index 2f5223bd..8ce049c0 100755 --- a/src/DP_View.py +++ b/src/DP_View.py @@ -1360,7 +1360,7 @@ def onEnter(self): if self.sessionData and str(self.sessionData[2]) == str(self.listViewList[int(currentIndex)][1]['ratingKey']): self.session.openWithCallback(self.myCallback, DP_Player, self.listViewList, currentIndex, self.libraryName, self.autoPlayMode, self.resumeMode, self.playbackMode, sessionData=self.sessionData) else: - if config.plugins.dreamplex.useForcedSubtitles.value and self.serverConfig.playbackType.value == "2": + if self.serverConfig.useForcedSubtitles.value and self.serverConfig.playbackType.value == "2": self.subtitleData = self.getSubtitleInformation() self.session.openWithCallback(self.myCallback, DP_Player, self.listViewList, currentIndex, self.libraryName, self.autoPlayMode, self.resumeMode, self.playbackMode, subtitleData=self.subtitleData) diff --git a/src/__init__.py b/src/__init__.py index 0faf3bac..c47c1c77 100755 --- a/src/__init__.py +++ b/src/__init__.py @@ -78,7 +78,6 @@ config.plugins.dreamplex.stopLiveTvOnStartup = ConfigYesNo() config.plugins.dreamplex.useCache = ConfigYesNo(default = True) config.plugins.dreamplex.usePicCache = ConfigYesNo(default = True) -config.plugins.dreamplex.useForcedSubtitles = ConfigYesNo(default = True) config.plugins.dreamplex.useBackdropVideos = ConfigYesNo() config.plugins.dreamplex.showDetailsInList = ConfigYesNo() config.plugins.dreamplex.showDetailsInListDetailType = ConfigSelection(default = "1", choices = [("1", "user"), ("2", "server")]) @@ -148,7 +147,6 @@ def printGlobalSettings(): printl("summerizeSections: " + str(config.plugins.dreamplex.summerizeSections.value), "__init__::initGlobalSettings", "I") printl("useCache: " + str(config.plugins.dreamplex.useCache.value), "__init__::initGlobalSettings", "I") printl("usePicCache: " + str(config.plugins.dreamplex.usePicCache.value), "__init__::initGlobalSettings", "I") - printl("useForcedSubtitles: " + str(config.plugins.dreamplex.useForcedSubtitles.value), "__init__::initGlobalSettings", "I") printl("", "__init__::initPlexSettings", "C") @@ -181,6 +179,7 @@ def initServerEntryConfig(): config.plugins.dreamplex.Entries[i].subtitlesForDirectLocal = ConfigYesNo() config.plugins.dreamplex.Entries[i].subtitlesLanguage = ConfigText(default = "de", visible_width = 2) + config.plugins.dreamplex.Entries[i].useForcedSubtitles = ConfigYesNo(default = True) printl("=== SERVER SETTINGS ===", "__init__::initServerEntryConfig", "D") @@ -233,6 +232,7 @@ def initServerEntryConfig(): # DIRECT LOCAL printl("=== DIRECT LOCAL ===", "__init__::initServerEntryConfig", "D") + printl("use forced subtitles: " + str(config.plugins.dreamplex.Entries[i].useForcedSubtitles.value), "__init__::initServerEntryConfig", "D") # DIRECT REMOTE config.plugins.dreamplex.Entries[i].smbUser = ConfigText(visible_width=50, fixed_size=False)