Support strm file playback regardless of method
This commit is contained in:
parent
cb9aeebd3d
commit
9d86604800
1 changed files with 14 additions and 0 deletions
|
@ -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()
|
||||||
|
|
Loading…
Reference in a new issue