Merge conflict
This commit is contained in:
parent
7e09253477
commit
b6128fe48c
1 changed files with 5 additions and 5 deletions
|
@ -44,11 +44,11 @@ class PlayUtils():
|
||||||
self.API.setPartNumber(partIndex)
|
self.API.setPartNumber(partIndex)
|
||||||
playurl = None
|
playurl = None
|
||||||
|
|
||||||
if item.get('MediaSources') and item['MediaSources'][0]['Protocol'] == "Http":
|
# if item.get('MediaSources') and item['MediaSources'][0]['Protocol'] == "Http":
|
||||||
# Only play as http
|
# # Only play as http
|
||||||
self.logMsg("File protocol is http.", 1)
|
# self.logMsg("File protocol is http.", 1)
|
||||||
playurl = self.httpPlay()
|
# playurl = self.httpPlay()
|
||||||
utils.window('emby_%s.playmethod' % playurl, value="DirectStream")
|
# utils.window('emby_%s.playmethod' % playurl, value="DirectStream")
|
||||||
|
|
||||||
if self.isDirectPlay():
|
if self.isDirectPlay():
|
||||||
self.logMsg("File is direct playing.", 1)
|
self.logMsg("File is direct playing.", 1)
|
||||||
|
|
Loading…
Reference in a new issue