The branch, eden-pre has been updated
via 1d03ec5d2d873ac97b90ce21b307dfe223d37057 (commit)
from 947e2ee3762c4a1028d2ebb5ea5e6fab5f5aa84d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1d03ec5d2d873ac97b90ce21b307dfe223d37057
commit 1d03ec5d2d873ac97b90ce21b307dfe223d37057
Author: spiff <[email protected]>
Date: Mon Sep 12 10:31:46 2011 +0200
[plugin.video.twit] updated to version 1.0.2
diff --git a/plugin.video.twit/addon.xml b/plugin.video.twit/addon.xml
index f400987..416406d 100644
--- a/plugin.video.twit/addon.xml
+++ b/plugin.video.twit/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.twit"
name="TWiT"
- version="1.0.1"
+ version="1.0.2"
provider-name="divingmule,thanks to Adam B.">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.twit/changelog.txt b/plugin.video.twit/changelog.txt
index 406dc81..ab0fcc7 100644
--- a/plugin.video.twit/changelog.txt
+++ b/plugin.video.twit/changelog.txt
@@ -1,3 +1,6 @@
+Version 1.0.2
+added TWiT Live via Ustream - 1.5 Mbs
+
Version 1.0.1
show updates
diff --git a/plugin.video.twit/default.py b/plugin.video.twit/default.py
index fec5621..54323b3 100644
--- a/plugin.video.twit/default.py
+++ b/plugin.video.twit/default.py
@@ -117,11 +117,35 @@ def VIDEOLINKS(url):
def addLiveLinks():
-
addLinkLive(__language__(30032),'http://bglive-a.bitgravity.com/twit/live/high',5,xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
-
addLinkLive(__language__(30033),'http://bglive-a.bitgravity.com/twit/live/low',5,xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
-
#addLink(__language__(30034),'rtmp://flash76.ustream.tv:1935/ustreamVideo/1524
playpath=streams/live app=ustreamVideo/1524
swfUrl="http://cdn1.ustream.tv/swf/4/viewer.rsl.558.swf";
pageUrl="http://live.twit.tv/"; live=true','','',xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
+
addLinkLive(__language__(30032),'http://bglive-a.bitgravity.com/twit/live/high?noprefix',5,xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
+
addLinkLive(__language__(30033),'http://bglive-a.bitgravity.com/twit/live/low?noprefix',5,xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
+
addLinkLive(__language__(30034),'http://cgw.ustream.tv/Viewer/getStream/1/1524.amf',6,xbmc.translatePath(
os.path.join( home, 'resources/live.png' ) ))
+
+def getSwf():
+ url = 'http://www.ustream.tv/flash/viewer.swf'
+ req = urllib2.Request(url)
+ response = urllib2.urlopen(req)
+ swfUrl = response.geturl()
+ return swfUrl
+def getUstream(url):
+ headers = {'User-agent' : 'Mozilla/5.0 (Windows; U; Windows NT 5.1;
en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13'}
+ data = None
+ req = urllib2.Request(url,data,headers)
+ response = urllib2.urlopen(req)
+ link=response.read()
+ response.close()
+ match = re.compile('.*(rtmp://.+?)\x00.*').findall(link)
+ rtmp = match[0]
+ sName = re.compile('.*streamName\W\W\W(.+?)[/]*\x00.*').findall(link)
+ playpath = ' playpath='+sName[0]
+ swf = ' swfUrl='+getSwf()
+ pageUrl = ' pageUrl=http://live.twit.tv'
+ url = rtmp + playpath + swf + pageUrl + ' swfVfy=1 live=true'
+ playLive(url)
+
+
def playLive(url):
item = xbmcgui.ListItem(path=url)
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, item)
@@ -231,4 +255,8 @@ elif mode==5:
print ""+url
playLive(url)
+elif mode==6:
+ print ""+url
+ getUstream(url)
+
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.twit/resources/language/English/strings.xml
b/plugin.video.twit/resources/language/English/strings.xml
index ad49748..78a2164 100644
--- a/plugin.video.twit/resources/language/English/strings.xml
+++ b/plugin.video.twit/resources/language/English/strings.xml
@@ -34,5 +34,5 @@
<string id='30031'>All About Android</string>
<string id='30032'>Bitgravity 1 Mbps</string>
<string id='30033'>Bitgravity 400 kbps</string>
- <string id='30034'>Ustream 600 kbps</string>
+ <string id='30034'>Ustream 1.5 Mbps</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.twit/addon.xml | 2 +-
plugin.video.twit/changelog.txt | 3 ++
plugin.video.twit/default.py | 34 ++++++++++++++++++--
.../resources/language/English/strings.xml | 2 +-
4 files changed, 36 insertions(+), 5 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
