Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2025-01-24 17:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Prevent subtitles for certain types"

Browse source 
This reverts commit f7872aea07.
This commit is contained in:
angelblue05 2018-03-31 06:31:28 -05:00
parent f7872aea07
commit 59696da287
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/lib/playutils.py
View file

@ -255,15 +255,14 @@ class PlayUtils():
def get_direct_url(self, source): def get_direct_url(self, source):
self.method = "DirectStream" self.method = "DirectStream"
media_type = self.item['Type']
if media_type == "Audio": if self.item['Type'] == "Audio":
url = "%s/emby/Audio/%s/stream.%s?static=true" % (self.server, self.item['Id'], self.item['MediaSources'][0]['Container']) url = "%s/emby/Audio/%s/stream.%s?static=true" % (self.server, self.item['Id'], self.item['MediaSources'][0]['Container'])
else: else:
url = "%s/emby/Videos/%s/stream?static=true" % (self.server, self.item['Id']) url = "%s/emby/Videos/%s/stream?static=true" % (self.server, self.item['Id'])
# Append external subtitles # Append external subtitles
if media_type in ('Movie', 'Episode') and settings('enableExternalSubs') == "true": if settings('enableExternalSubs') == "true":
self.set_external_subs(source, url) self.set_external_subs(source, url)
return url return url
@ -273,7 +272,6 @@ class PlayUtils():
self.method = "Transcode" self.method = "Transcode"
item_id = self.item['Id'] item_id = self.item['Id']
media_type = self.item['Type']
url = urllib_path("%s/emby/Videos/%s/master.m3u8" % (self.server, item_id), { url = urllib_path("%s/emby/Videos/%s/master.m3u8" % (self.server, item_id), {
'VideoCodec': "h264", 'VideoCodec': "h264",
@ -284,8 +282,7 @@ class PlayUtils():
}) })
# Select audio and subtitles # Select audio and subtitles
if media_type in ('Movie', 'Episode'): url += self.get_audio_subs(source)
url += self.get_audio_subs(source)
# Limit to 8 bit if user selected transcode Hi10P # Limit to 8 bit if user selected transcode Hi10P
if settings('transcodeHi10P') == "true": if settings('transcodeHi10P') == "true":