diff --git a/addon.xml b/addon.xml index 99a74c8..6be773e 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,9 @@ resources/img/kodi/clearlogo.png - 0.9.8 + 0.9.9 +- play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl +0.9.8 - add folder display settings - add random musly list folder - add incoming / incoming hits folder diff --git a/changelog.txt b/changelog.txt index 78da414..6acc40e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +0.9.9 +- play with new Vimeo Add-on from jaylinski if it's available and otherwise fallback to youtube-dl 0.9.8 - add folder display settings - add random musly list folder diff --git a/default.py b/default.py index 4187526..9d565a3 100644 --- a/default.py +++ b/default.py @@ -281,12 +281,16 @@ def play(url): playback_url = ytdl.streamURL() else: if "vimeo" in entry['provider']: - # quick hard coded workaround - xbmc.log(msg="vimeo addon is broken, playing with ytdl", level=xbmc.LOGNOTICE) - import YDStreamExtractor - idVideo = entry['purl'] - ytdl = YDStreamExtractor.getVideoInfo(idVideo) - playback_url = ytdl.streamURL() + if xbmc.getCondVisibility("System.HasAddon(plugin.video.vimeo)") and int((xbmcaddon.Addon("plugin.video.vimeo").getAddonInfo("version").strip().replace(".",""))) >= 500: + xbmc.log(msg="using the new Vimeo addon from jaylinski", level=xbmc.LOGNOTICE) + playback_url = entry['url'] + else: + # quick hard coded workaround + xbmc.log(msg="old vimeo addon is broken, playing with ytdl. Please install the new jaylinski Vimeo Addon from the official KODI Repo", level=xbmc.LOGNOTICE) + import YDStreamExtractor + idVideo = entry['purl'] + ytdl = YDStreamExtractor.getVideoInfo(idVideo) + playback_url = ytdl.streamURL() else: # without youtube_dl xbmc.log(msg="without ytdl", level=xbmc.LOGDEBUG)