From b6128fe48cd8dd66cdc0baa9c41348dfe9ffd313 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Sat, 9 Jan 2016 16:18:57 +0100 Subject: [PATCH] Merge conflict --- resources/lib/playutils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py index 8b947c6c..6fe3e281 100644 --- a/resources/lib/playutils.py +++ b/resources/lib/playutils.py @@ -44,11 +44,11 @@ class PlayUtils(): self.API.setPartNumber(partIndex) playurl = None - if item.get('MediaSources') and item['MediaSources'][0]['Protocol'] == "Http": - # Only play as http - self.logMsg("File protocol is http.", 1) - playurl = self.httpPlay() - utils.window('emby_%s.playmethod' % playurl, value="DirectStream") + # if item.get('MediaSources') and item['MediaSources'][0]['Protocol'] == "Http": + # # Only play as http + # self.logMsg("File protocol is http.", 1) + # playurl = self.httpPlay() + # utils.window('emby_%s.playmethod' % playurl, value="DirectStream") if self.isDirectPlay(): self.logMsg("File is direct playing.", 1)