Merge pull request #119 from anxdpanic/tw

now use inputstream.adaptive for dash support
Kolifanes · Nov 28, 2016 · 5db1910 · 5db1910
2 parents 63f2716 + 028b44a
commit 5db1910
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 37 deletions.
diff --git a/addon.xml b/addon.xml
@@ -8,7 +8,7 @@
 	</extension>
 	<extension point="xbmc.addon.metadata">
         <news>
-[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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -485,12 +485,12 @@ def on_search(self, search_text, context, re_match):
         return result
 
     @kodion.RegisterProviderPath('^/config/(?P<switch>.*)/$')
-    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
@@ -6,7 +6,7 @@
         <!-- kodion Visual -->
         <setting id="kodion.video.quality" type="enum" label="30010" enable="eq(1,false)" lvalues="30016|30017|30011|30012|30018" default="3"/>
         <setting id="kodion.video.quality.ask" type="bool" label="30009" default="false"/>
-        <setting id="kodion.video.quality.mpd" type="bool" label="30007" default="false" enable="System.HasAddon(inputstream.mpd)"/>
+        <setting id="kodion.video.quality.mpd" type="bool" label="30007" default="false" enable="System.HasAddon(inputstream.adaptive)"/>
         <setting id="kodion.video.quality.mpd.configure" type="action" label="30008" enable="eq(-1,true)" visible="eq(-1,true)" option="close" action="RunPlugin(plugin://plugin.video.youtube/config/mpd/)"/>
         <setting id="kodion.subtitle.languages" type="enum" label="30560" lvalues="30561|30562|30563|30564|30565|30566" default="0"/>
         <setting id="youtube.playlist.watchlater.autoremove" type="bool" label="30515" default="true" />