The branch, frodo has been updated
via 86c074a7bee0a61598dd9181309880c56285f585 (commit)
from 4f57a4e1b1d6ed75231b343919bf6703ca0827a3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=86c074a7bee0a61598dd9181309880c56285f585
commit 86c074a7bee0a61598dd9181309880c56285f585
Author: Martijn Kaijser <[email protected]>
Date: Sun Dec 8 00:06:58 2013 +0100
[plugin.video.si] 1.3.1
diff --git a/plugin.video.si/README.txt b/plugin.video.si/README.txt
index db15da2..3555cbd 100644
--- a/plugin.video.si/README.txt
+++ b/plugin.video.si/README.txt
@@ -6,4 +6,8 @@ XBMC Addon for Sports Illustrated
version 1.1.0 initial release
-version 1.1.1 minor changes to addon.xml description
\ No newline at end of file
+version 1.1.1 minor changes to addon.xml description
+
+version 1.2.1 added 720p support for most videos where available - defaults to
SD, use addon config to set HD
+
+version 1.3.1 added missing script.module.pyamf in addon.xml
diff --git a/plugin.video.si/addon.xml b/plugin.video.si/addon.xml
index e0fec16..649827a 100644
--- a/plugin.video.si/addon.xml
+++ b/plugin.video.si/addon.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.si"
name="Sports Illustrated"
- version="1.1.1"
+ version="1.3.1"
provider-name="t1m">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
+ <import addon="script.module.pyamf" version="0.6.2"/>
</requires>
<extension point="xbmc.python.pluginsource"
library="default.py">
diff --git a/plugin.video.si/changelog.txt b/plugin.video.si/changelog.txt
index 96b27cb..e2846e3 100644
--- a/plugin.video.si/changelog.txt
+++ b/plugin.video.si/changelog.txt
@@ -1,3 +1,7 @@
+version 1.3.1 added missing script.module.pyamf in addon.xml
+
+version 1.2.1 added 720p support for most videos where available - defaults to
SD, use addon config to set HD
+
version 1.1.1 minor changes to addon.xml description
Version 1.1.0 Initial release
diff --git a/plugin.video.si/default.py b/plugin.video.si/default.py
index 94c3cdb..04f62fe 100644
--- a/plugin.video.si/default.py
+++ b/plugin.video.si/default.py
@@ -217,21 +217,28 @@ def play_video(video_url):
# use 'IOSRenditions' in place of 'renditions' in below for .m3u8 list, note
case of 'r' in renditions, using 'renditions' gives you rtmp links
- stored_size = 0
+ stored_size=stored_height = 0
for item in
sorted(renditions['programmedContent']['videoPlayer']['mediaDTO']['renditions'],
key = lambda item:item['frameHeight'], reverse = False):
stream_size = item['size']
+ stream_height = item['frameHeight']
if (int(stream_size) > stored_size):
finalurl = item['defaultURL']
stored_size = stream_size
+ stored_height = stream_height
#this is a kludge because I can't get some rtmps to play, so use the IOS .m3u8
list if it exists (the ones with IOSRenditions don't play rtmp correctly)
- stored_size = 0
- for item in
sorted(renditions['programmedContent']['videoPlayer']['mediaDTO']['IOSRenditions'],
key = lambda item:item['frameHeight'], reverse = False):
- stream_size = item['size']
- if (int(stream_size) > stored_size):
- finalurl = item['defaultURL']
- stored_size = stream_size
+ if (stored_height == 720) and (addon.getSetting('vid_res') == "1") and
("&mp4:23/" in finalurl):
+ match = re.compile('&mp4:(.+?)\?').findall(finalurl)
+ for x in match:
+ finalurl = "http://brightcove04.brightcove.com/"+x
+ else:
+ stored_size = 0
+ for item in
sorted(renditions['programmedContent']['videoPlayer']['mediaDTO']['IOSRenditions'],
key = lambda item:item['frameHeight'], reverse = False):
+ stream_size = item['size']
+ if (int(stream_size) > stored_size):
+ finalurl = item['defaultURL']
+ stored_size = stream_size
# finalurl = finalurl.replace('.mp4?','.mp4&') # this needs work where
the app, playpath, wierdqs split doesn't work right below
@@ -247,10 +254,6 @@ def play_video(video_url):
finalurl = "%s tcUrl=%s app=%s playpath=%s%s swfUrl=%s conn=B:0
conn=S:%s&%s" % (tcurl,tcurl, app, playpath, qs, swf_url, playpath, wierdqs)
log("final rtmp: url =%s" % (finalurl,))
- desc =
renditions['programmedContent']['videoPlayer']['mediaDTO']['shortDescription']
- thumbnail =
renditions['programmedContent']['videoPlayer']['mediaDTO']['thumbnailURL']
- title =
renditions['programmedContent']['videoPlayer']['mediaDTO']['displayName']
-
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path
= finalurl))
diff --git a/plugin.video.si/resources/language/english/strings.xml
b/plugin.video.si/resources/language/english/strings.xml
index e044864..68200f7 100644
--- a/plugin.video.si/resources/language/english/strings.xml
+++ b/plugin.video.si/resources/language/english/strings.xml
@@ -2,7 +2,7 @@
<strings>
<string id="30000">Settings</string>
<string id="30001">No Playable Video Found</string>
- <string id="30002">Preferred Live Stream Quality (not implemented
yet)</string>
+ <string id="30002">Preferred Live Stream Quality (HD may cause
buffering)</string>
<string id="30003">Auto Play SI Recent Videos</string>
</strings>
diff --git a/plugin.video.si/resources/settings.xml
b/plugin.video.si/resources/settings.xml
index 75d515e..84c5c4a 100644
--- a/plugin.video.si/resources/settings.xml
+++ b/plugin.video.si/resources/settings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<category label="30000">
- <setting id="vid_res" type="enum" label="30002"
values="720p|360p|240p|180p" default="0" />
- <setting id="auto_play" type="bool" label="30003" default="false" />
+ <setting id="vid_res" type="enum" label="30002" values="SD | HD"
default="0" />
</category>
</settings>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.si/README.txt | 6 ++++-
plugin.video.si/addon.xml | 3 +-
plugin.video.si/changelog.txt | 4 +++
plugin.video.si/default.py | 25 +++++++++++--------
.../resources/language/english/strings.xml | 2 +-
plugin.video.si/resources/settings.xml | 3 +-
6 files changed, 27 insertions(+), 16 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
