From 86c4db78f983c923e4fe8d0b9a5eea5e26da7dc6 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Wed, 30 Sep 2015 18:19:34 -0500
Subject: [PATCH] Change dialog to notification for direct play

Still allow for playback, while letting the user know.
---
 resources/lib/PlayUtils.py | 26 ++++++++++++++------------
 resources/settings.xml     |  1 +
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/resources/lib/PlayUtils.py b/resources/lib/PlayUtils.py
index 09517c32..efb48d51 100644
--- a/resources/lib/PlayUtils.py
+++ b/resources/lib/PlayUtils.py
@@ -90,19 +90,21 @@ class PlayUtils():
             if self.fileExists(result):
                 return True
             else:
-                self.logMsg("Unable to direct play. Verify the following path is accessible by the device: %s. You might also need to add SMB credentials in the addon settings." % result[u'MediaSources'][0][u'Path'])
+                self.logMsg("Unable to direct play. Verify the following path is accessible by the device: %s. You might also need to add SMB credentials in the add-on settings." % result['MediaSources'][0]['Path'], 1)
                 if dialog:
-                    # Let user know that direct play failed
-                    dialog = xbmcgui.Dialog()
-                    resp = dialog.select('Warning: Unable to direct play.', ['Play from HTTP', 'Play from HTTP and remember next time.'])
-                    if resp == 1:
-                        # Remember next time
-                        utils.settings('playFromStream', "true")
-                    elif resp < 0:
-                        # User decided not to proceed.
-                        self.logMsg("User cancelled HTTP selection dialog.", 1)
-                        self.WINDOW.setProperty("playurlFalse", "true")
-                        
+                    
+                    failCount = int(utils.settings('directSteamFailedCount'))
+                    self.logMsg("Direct Play failCount: %s." % failCount, 1)
+                    
+                    if failCount < 2:
+                        # Let user know that direct play failed
+                        utils.settings('directSteamFailedCount', value=str(failCount + 1))
+                        xbmcgui.Dialog().notification("Emby server", "Unable to direct play. Verify your log for more information.", icon="special://home/addons/plugin.video.emby/icon.png", sound=False)
+                    elif utils.settings('playFromStream') != "true":
+                        # Permanently set direct stream as true
+                        utils.settings('playFromStream', value="true")
+                        xbmcgui.Dialog().notification("Emby server", "Enabled play from HTTP in add-on settings.", icon="special://home/addons/plugin.video.emby/icon.png", sound=False)
+
                 return False
 
 
diff --git a/resources/settings.xml b/resources/settings.xml
index 54fce7b9..dfb0cd73 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -41,6 +41,7 @@
 		<setting id="resumeJumpBack" type="slider" label="On Resume Jump Back Seconds" default="10" range="0,1,120" option="int" visible="true" enable="true" />
 	    <setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" default="false" />
 	    <setting id="videoBitRate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="eq(-1,true)" default="17" />
+	    <setting id="directSteamFailedCount" type="number" visible="false" default="0" />
 	</category>
 	<category label="Extras">
 	    <setting id="disableCoverArt" type="bool" label="30157" default="false" visible="true" enable="true" />