troubleshouting setting to ignore inputstream.adaptive (#255)

add-ons · May 18, 2019 · 0a5d23b · 0a5d23b
1 parent f86f3eb
commit 0a5d23b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -334,6 +334,10 @@ msgctxt "#30869"
 msgid "Log level"
 msgstr ""
 
+msgctxt "#30871"
+msgid "Use InputStream Adaptive"
+msgstr ""
+
 
 ### MESSAGES
 msgctxt "#30951"

diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
@@ -311,6 +311,10 @@ msgctxt "#30069"
 msgid "Log level"
 msgstr "Log level"
 
+msgctxt "#30871"
+msgid "Use InputStream Adaptive"
+msgstr "Gebruik InputStream Adaptive"
+
 
 ### MESSAGES
 msgctxt "#30951"

diff --git a/resources/lib/__init__.pyo b/resources/lib/__init__.pyo
diff --git a/resources/lib/kodiwrappers/kodiwrapper.py b/resources/lib/kodiwrappers/kodiwrapper.py
@@ -312,16 +312,19 @@ def get_proxies(self):
 
         return dict(http=proxy_address, https=proxy_address)
 
-    # NOTE: InputStream Adaptive is not pre-installed on Windows and in some cases users can uninstall it
-    def has_inputstream_adaptive_installed(self):
-        return xbmc.getCondVisibility('System.HasAddon("{0}")'.format('inputstream.adaptive')) == 1
+    def has_inputstream_adaptive(self):
+        if self.get_setting('useinputstreamadaptive') == 'true':
+            return xbmc.getCondVisibility('System.HasAddon("{0}")'.format('inputstream.adaptive')) == 1
+        return False
 
     def has_credentials(self):
         return bool(self.get_setting('username') and self.get_setting('password'))
 
     def can_play_drm(self):
-        kodi_version = int(xbmc.getInfoLabel('System.BuildVersion').split('.')[0])
-        return kodi_version > 17
+        if self.get_setting('useinputstreamadaptive') == 'true':
+            kodi_version = int(xbmc.getInfoLabel('System.BuildVersion').split('.')[0])
+            return kodi_version > 17
+        return False
 
     def get_userdata_path(self):
         return xbmc.translatePath(self._addon.getAddonInfo('profile'))

diff --git a/resources/lib/vrtplayer/streamservice.py b/resources/lib/vrtplayer/streamservice.py
@@ -204,7 +204,7 @@ def get_stream(self, video, retry=False, api_data=None):
                 drm_stream = (vudrm_token or uplynk)
 
                 # Select streaming protocol
-                if not drm_stream and self._kodi.has_inputstream_adaptive_installed() or drm_stream and self._can_play_drm and self._kodi.get_setting('usedrm') == 'true':
+                if not drm_stream and self._kodi.has_inputstream_adaptive() or drm_stream and self._can_play_drm and self._kodi.get_setting('usedrm') == 'true':
                     protocol = 'mpeg_dash'
                 elif vudrm_token:
                     protocol = 'hls_aes'

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -22,5 +22,6 @@
         <setting label="30865" help="30866" type="action" id="refresh_favorites" action="RunPlugin(plugin://plugin.video.vrt.nu/?action=refreshfavorites)"/>
         <setting label="30867" help="30868" type="action" id="clear_tokens" action="RunPlugin(plugin://plugin.video.vrt.nu/?action=clearcookies)"/>
         <setting label="30869" help="30870" type="select" id="max_log_level" values="Quiet|Info|Verbose|Debug" default="Info"/>
+        <setting label="30871" help="30872" type="bool" id="useinputstreamadaptive" default="true"/>
     </category>
 </settings>