diff --git a/addon.xml b/addon.xml index 9d2cd24..4f16268 100755 --- a/addon.xml +++ b/addon.xml @@ -8,7 +8,7 @@ -[add] MPEG-DASH support for Kodi 17 w/ inputstream.mpd Add-on +[add] MPEG-DASH support for Kodi 17 w/ inputstream.adaptive Add-on [add] optional History and Watch Later custom playlist to Settings -> Folders, or (My)Playlists context menu to set/remove [add] Maintenance section to Settings [add] 'Subtitle language(s) to download' selection to Settings -> General diff --git a/changelog.txt b/changelog.txt index c4aa4c0..7b7414a 100755 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ 5.3.5 -[add] MPEG-DASH support for Kodi 17 w/ inputstream.mpd Add-on +[add] MPEG-DASH support for Kodi 17 w/ inputstream.adaptive Add-on [add] optional History and Watch Later custom playlist to Settings -> Folders, or (My)Playlists context menu to set/remove [add] Maintenance section to Settings [add] 'Subtitle language(s) to download' selection to Settings -> General diff --git a/resources/language/Bulgarian/strings.po b/resources/language/Bulgarian/strings.po index 18f8693..96722b9 100755 --- a/resources/language/Bulgarian/strings.po +++ b/resources/language/Bulgarian/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Chinese (Traditional)/strings.po b/resources/language/Chinese (Traditional)/strings.po index 9a4c5d7..98a5dd2 100755 --- a/resources/language/Chinese (Traditional)/strings.po +++ b/resources/language/Chinese (Traditional)/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Czech/strings.po b/resources/language/Czech/strings.po index 5899b9e..1066843 100755 --- a/resources/language/Czech/strings.po +++ b/resources/language/Czech/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po index 1d74b8b..4ee0f5a 100644 --- a/resources/language/Dutch/strings.po +++ b/resources/language/Dutch/strings.po @@ -592,5 +592,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index a1a9b5c..d191fb4 100755 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -45,7 +45,7 @@ msgid "Use MPEG-DASH" msgstr "" msgctxt "#30008" -msgid "Configure MPEG-DASH InputStream Client" +msgid "Configure inputstream.adaptive" msgstr "" msgctxt "#30009" @@ -600,5 +600,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/French/strings.po b/resources/language/French/strings.po index 102a4d8..33bd47c 100755 --- a/resources/language/French/strings.po +++ b/resources/language/French/strings.po @@ -592,5 +592,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po index 69ddc9a..b589f13 100755 --- a/resources/language/German/strings.po +++ b/resources/language/German/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Greek/strings.po b/resources/language/Greek/strings.po index 2c80d18..adf840c 100644 --- a/resources/language/Greek/strings.po +++ b/resources/language/Greek/strings.po @@ -43,7 +43,7 @@ msgctxt "#30007" msgid "Use MPEG-DASH" msgstr "Χρησιμοποίησε το MPEG-DASH" msgctxt "#30008" -msgid "Configure MPEG-DASH InputStream Client" +msgid "Configure inputstream.adaptive" msgstr "Ρύθμιση πελάτη MPEG-DASH Inputstream" msgctxt "#30009" @@ -598,5 +598,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Hebrew/strings.po b/resources/language/Hebrew/strings.po index 72a1618..c7a20d0 100755 --- a/resources/language/Hebrew/strings.po +++ b/resources/language/Hebrew/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Hungarian/strings.po b/resources/language/Hungarian/strings.po index 7dbd648..57d9964 100755 --- a/resources/language/Hungarian/strings.po +++ b/resources/language/Hungarian/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 655fa2b..729f8b4 100755 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Korean/strings.po b/resources/language/Korean/strings.po index 14713e2..e9c9492 100755 --- a/resources/language/Korean/strings.po +++ b/resources/language/Korean/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Norwegian/strings.po b/resources/language/Norwegian/strings.po index 677aef4..d33d823 100644 --- a/resources/language/Norwegian/strings.po +++ b/resources/language/Norwegian/strings.po @@ -45,8 +45,8 @@ msgid "Use MPEG-DASH" msgstr "Bruk MPEG-DASH" msgctxt "#30008" -msgid "Configure MPEG-DASH InputStream Client" -msgstr "Sett opp MPEG-DASH InputStream klient" +msgid "Configure inputstream.adaptive" +msgstr "Sett opp inputstream.adaptive" msgctxt "#30009" msgid "Always ask for the video quality" @@ -600,5 +600,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po index c17b5c1..60da288 100755 --- a/resources/language/Polish/strings.po +++ b/resources/language/Polish/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Portuguese (Brazil)/strings.po b/resources/language/Portuguese (Brazil)/strings.po index e57e6ba..d20af43 100755 --- a/resources/language/Portuguese (Brazil)/strings.po +++ b/resources/language/Portuguese (Brazil)/strings.po @@ -41,8 +41,8 @@ msgid "Use MPEG-DASH" msgstr "Usar Mpeg-Dash" msgctxt "#30008" -msgid "Configure MPEG-DASH InputStream Client" -msgstr "Configurar o addon Mpeg-Dash InputStream Client" +msgid "Configure inputstream.adaptive" +msgstr "Configurar o addon inputstream.adaptive" msgctxt "#30009" msgid "Always ask for the video quality" @@ -581,5 +581,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Portuguese/strings.po b/resources/language/Portuguese/strings.po index 7f236d7..ac3db5e 100755 --- a/resources/language/Portuguese/strings.po +++ b/resources/language/Portuguese/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Romanian/strings.po b/resources/language/Romanian/strings.po index a62fa54..ed72775 100755 --- a/resources/language/Romanian/strings.po +++ b/resources/language/Romanian/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Russian/strings.po b/resources/language/Russian/strings.po index 82c2fe5..d509ac3 100755 --- a/resources/language/Russian/strings.po +++ b/resources/language/Russian/strings.po @@ -592,5 +592,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po index c616951..c829175 100755 --- a/resources/language/Slovak/strings.po +++ b/resources/language/Slovak/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po index 244e536..5067465 100755 --- a/resources/language/Spanish/strings.po +++ b/resources/language/Spanish/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/language/Ukrainian/strings.po b/resources/language/Ukrainian/strings.po index 4c519ff..6ad3583 100755 --- a/resources/language/Ukrainian/strings.po +++ b/resources/language/Ukrainian/strings.po @@ -583,5 +583,5 @@ msgid "Force SSL Certificate verification" msgstr "" msgctxt "#30579" -msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.mpd appears to be disabled. Would you like to enable inputstream.mpd now?" +msgid "MPEG-DASH is enabled in the YouTube settings, however inputstream.adaptive appears to be disabled. Would you like to enable inputstream.adaptive now?" msgstr "" diff --git a/resources/lib/kodion/impl/xbmc/xbmc_items.py b/resources/lib/kodion/impl/xbmc/xbmc_items.py index b913789..a3633b7 100755 --- a/resources/lib/kodion/impl/xbmc/xbmc_items.py +++ b/resources/lib/kodion/impl/xbmc/xbmc_items.py @@ -25,10 +25,10 @@ def to_video_item(context, video_item): if video_item.get_context_menu() is not None: item.addContextMenuItems(video_item.get_context_menu(), replaceItems=video_item.replace_context_menu()) pass + if video_item.use_dash(): - item.setProperty('inputstreamaddon', 'inputstream.mpd') - else: - item.setProperty('inputstreamaddon', '') + item.setProperty('inputstreamaddon', 'inputstream.adaptive') + item.setProperty('inputstream.adaptive.manifest_type', 'mpd') item.setProperty(u'IsPlayable', u'true') diff --git a/resources/lib/youtube/helper/video_info.py b/resources/lib/youtube/helper/video_info.py index 4aafe2e..23d9210 100755 --- a/resources/lib/youtube/helper/video_info.py +++ b/resources/lib/youtube/helper/video_info.py @@ -599,9 +599,9 @@ def _method_get_video_info(self, video_id): major_version = self._context.get_system_version().get_version()[0] if major_version > 16: use_dash = True - if not self._context.addon_enabled('inputstream.mpd'): + if not self._context.addon_enabled('inputstream.adaptive'): if self._context.get_ui().on_yes_no_input(self._context.get_name(), self._context.localize(30579)): - use_dash = self._context.set_addon_enabled('inputstream.mpd') + use_dash = self._context.set_addon_enabled('inputstream.adaptive') else: use_dash = False else: diff --git a/resources/lib/youtube/provider.py b/resources/lib/youtube/provider.py index 2cbaa7b..159a743 100755 --- a/resources/lib/youtube/provider.py +++ b/resources/lib/youtube/provider.py @@ -485,12 +485,12 @@ def on_search(self, search_text, context, re_match): return result @kodion.RegisterProviderPath('^/config/(?P.*)/$') - def configure_mpd_inputstream(self, context, re_match): + def configure_addon(self, context, re_match): switch = re_match.group('switch') if switch == 'youtube': context._addon.openSettings() elif switch == 'mpd': - xbmcaddon.Addon(id='inputstream.mpd').openSettings() + xbmcaddon.Addon(id='inputstream.adaptive').openSettings() else: return False diff --git a/resources/settings.xml b/resources/settings.xml index 9b2450f..b47bf74 100755 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -6,7 +6,7 @@ - +