diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index 5d7e87b8..156e4157 100644 --- 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 index 14ebfcb5..6b877f22 100644 --- 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 new file mode 100644 index 00000000..1025c63d Binary files /dev/null and b/resources/lib/__init__.pyo differ diff --git a/resources/lib/kodiwrappers/kodiwrapper.py b/resources/lib/kodiwrappers/kodiwrapper.py index 3201dbb9..1b003673 100644 --- 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 index 33c13351..911ad01a 100644 --- 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 index 2b8797b7..897823ba 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -22,5 +22,6 @@ +