Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support strm file playback regardless of method

This commit is contained in:
angelblue05 2015-09-17 16:00:58 -05:00
parent cb9aeebd3d
commit 9d86604800
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/lib/PlayUtils.py
View File

@ -79,6 +79,10 @@ class PlayUtils():
self.logMsg("Can't direct play: Server does not allow or support it.", 1) self.logMsg("Can't direct play: Server does not allow or support it.", 1)
return False return False
if result['Path'].endswith('.strm'):
# Allow strm loading when direct playing
return True
location = result[u'LocationType'] location = result[u'LocationType']
# File needs to be "FileSystem" # File needs to be "FileSystem"
if u'FileSystem' in location: if u'FileSystem' in location:
@ -160,6 +164,11 @@ class PlayUtils():
def directStream(self, result, server, id, type = "Video"): def directStream(self, result, server, id, type = "Video"):
if result['Path'].endswith('.strm'):
# Allow strm loading when direct streaming
playurl = self.directPlay(result)
return playurl
try: try:
if "ThemeVideo" in type: if "ThemeVideo" in type:
playurl ="%s/mediabrowser/Videos/%s/stream?static=true" % (server, id) playurl ="%s/mediabrowser/Videos/%s/stream?static=true" % (server, id)
@ -193,6 +202,11 @@ class PlayUtils():
def transcoding(self, result, server, id): def transcoding(self, result, server, id):
if result['Path'].endswith('.strm'):
# Allow strm loading when transcoding
playurl = self.directPlay(result)
return playurl
try: try:
# Play transcoding # Play transcoding
deviceId = self.clientInfo.getMachineId() deviceId = self.clientInfo.getMachineId()