Add temporary setting to disable external subs

For direct stream
This commit is contained in:
angelblue05 2016-07-22 11:54:53 -05:00
parent f89d5c96f6
commit e97a3a616d
2 changed files with 3 additions and 1 deletions

View file

@ -16,6 +16,7 @@ import downloadutils
import playutils as putils import playutils as putils
import playlist import playlist
import read_embyserver as embyserver import read_embyserver as embyserver
import shutil
from utils import Logging, window, settings, language as lang from utils import Logging, window, settings, language as lang
################################################################################################# #################################################################################################
@ -228,7 +229,7 @@ class PlaybackUtils():
# Append external subtitles to stream # Append external subtitles to stream
playmethod = window('%s.playmethod' % embyitem) playmethod = window('%s.playmethod' % embyitem)
# Only for direct stream # Only for direct stream
if playmethod in ("DirectStream"): if playmethod in ("DirectStream") and settings('enableExternalSubs') == "true":
# Direct play automatically appends external # Direct play automatically appends external
subtitles = self.externalSubs(playurl) subtitles = self.externalSubs(playurl)
listitem.setSubtitles(subtitles) listitem.setSubtitles(subtitles)

View file

@ -54,6 +54,7 @@
<setting type="sep" /> <setting type="sep" />
<setting id="playFromStream" type="bool" label="30002" default="false" /> <setting id="playFromStream" type="bool" label="30002" default="false" />
<setting id="videoBitrate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="true" default="17" subsetting="true" /> <setting id="videoBitrate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="true" default="17" subsetting="true" />
<setting id="enableExternalSubs" type="bool" label="Enable external subs for direct stream" default="true" />
<setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled|480p(and higher)|720p(and higher)|1080p" /> <setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled|480p(and higher)|720p(and higher)|1080p" />
<setting id="transcodeHi10P" type="bool" label="30537" default="false"/> <setting id="transcodeHi10P" type="bool" label="30537" default="false"/>
<setting id="markPlayed" type="number" visible="false" default="90" /> <setting id="markPlayed" type="number" visible="false" default="90" />