The branch, frodo has been updated
via e5869b02710cce8080ad852424503004aa0622ab (commit)
via 491d8948e03c226127393a49037b210bccd25881 (commit)
from 9fc30768b9ef07375a53d3290c0b7368040f7f41 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e5869b02710cce8080ad852424503004aa0622ab
commit e5869b02710cce8080ad852424503004aa0622ab
Author: beenje <[email protected]>
Date: Sat Apr 27 20:32:15 2013 +0200
[plugin.video.itbn_org] updated to version 1.2.1
diff --git a/plugin.video.itbn_org/addon.xml b/plugin.video.itbn_org/addon.xml
index b81a417..767af2e 100644
--- a/plugin.video.itbn_org/addon.xml
+++ b/plugin.video.itbn_org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.itbn_org"
- version="1.2.0"
+ version="1.2.1"
name="iTBN"
provider-name="Romans I XVI"
>
@@ -16,6 +16,10 @@
<summary>XBMC iTBN Viewer</summary>
<description>iTBN gives access to thousands of hours worth of videos
that have aired on TBN, The Church Channel, JC-TV, Smile of a Child, and
more.[CR][CR]This addon gives the ability to view videos from iTBN.org and also
provides live streams of TBN's 12 television networks.</description>
<platform>all</platform>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=162703</forum>
+ <source>https://github.com/asojka09/plugin.video.itbn_org.git</source>
+ <email>[email protected]</email>
</extension>
</addon>
diff --git a/plugin.video.itbn_org/changelog.txt
b/plugin.video.itbn_org/changelog.txt
index c37fb86..45e0e83 100644
--- a/plugin.video.itbn_org/changelog.txt
+++ b/plugin.video.itbn_org/changelog.txt
@@ -11,4 +11,9 @@ Version 1.1.6
version 1.2.0
-Removed the extra "Play Video" button before loading video.
--All live streams now play in HD
\ No newline at end of file
+-All live streams now play in HD
+
+version 1.2.1
+-Fixed the previous page button (It now calls the Action(Back) function
instead of adding another directory.)
+-Added optional tags.
+-Added settings for quality of live streams and a option to disable thumbnail
view.
diff --git a/plugin.video.itbn_org/default.py b/plugin.video.itbn_org/default.py
index e4bc4e4..340e9dc 100644
--- a/plugin.video.itbn_org/default.py
+++ b/plugin.video.itbn_org/default.py
@@ -65,7 +65,8 @@ def ADDLINKS(url):
mylist=zip((source),(name),(thumbnail),(description))
addDir('Main Menu','',None,main_menu_thumb)
if previouspage:
- addDir('Page
'+previouspagelabel,'http://www.itbn.org'+previouspage[0],1,previous_thumb)
+ previousurl =
sys.argv[0]+"?url="+urllib.quote_plus('http://www.itbn.org'+previouspage[0])+"&mode="+str(11)+"&name="+urllib.quote_plus('Page
'+previouspagelabel)
+ addLink('Page '+previouspagelabel,previousurl,previous_thumb)
for url,name,thumbnail,description in mylist:
description=description.replace(""","\"")
description=description.replace("'","\'")
@@ -81,8 +82,12 @@ def ADDLINKS(url):
if nextpage:
addDir('Page
'+nextpagelabel,'http://www.itbn.org'+nextpage[0],1,next_thumb)
video_view = settings.getSetting("list_view") == "1"
- if 1==1:
- xbmc.executebuiltin("Container.SetViewMode(500)")
+ if settings.getSetting("thumbnailview") == 'true':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'false':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(50)')
def GETSOURCE(url,name):
req = urllib2.Request(url)
@@ -190,13 +195,19 @@ def LIVE(url):
response = urllib2.urlopen(req)
link=response.read()
response.close()
- match='rtmp://cp114430.live.edgefcs.net/live/
playpath=tbn_mbr_600@101613 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114428.live.edgefcs.net/live/
playpath=churchch_mbr_600@101620 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114432.live.edgefcs.net/live/
playpath=jctv_mbr_600@101615 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114426.live.edgefcs.net/live/
playpath=soac_mbr_600@101622 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114434.live.edgefcs.net/live/
playpath=enlace_mbr_600@101618 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114436.live.edgefcs.net/live/
playpath=enlacejuvenil_800@102106 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129063.live.edgefcs.net/live/
playpath=nejat_mbr_600@101623 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129064.live.edgefcs.net/live/
playpath=healing_mbr_600@101624 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129065.live.edgefcs.net/live/
playpath=tbnrussia-high@58776 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129066.live.edgefcs.net/live/
playpath=soacrussia-high@58777 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn/
playpath=juce_super.sdp
live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn_repeater/
playpath=tbnafrica.stream live=true'
+ if settings.getSetting("quality") == '0':
+
match=re.compile('\"andsuperstreamurl\":\"(.+?)\"').findall(link)
+ if settings.getSetting("quality") == '1':
+ match='rtmp://cp114430.live.edgefcs.net/live/
playpath=tbn_mbr_300@101613 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114428.live.edgefcs.net/live/
playpath=churchch_mbr_300@101620 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114432.live.edgefcs.net/live/
playpath=jctv_mbr_300@101615 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114426.live.edgefcs.net/live/
playpath=soac_mbr_300@101622 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114434.live.edgefcs.net/live/
playpath=enlace_mbr_300@101618 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114436.live.edgefcs.net/live/
playpath=enlacejuvenil_800@102106 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129063.live.edgefcs.net/live/
playpath=nejat_mbr_300@101623 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129064.live.edgefcs.net/live/
playpath=healing_mbr_300@101624 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129065.live.edgefcs.net/live/
playpath=tbnrussia-high@58776 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129066.live.edgefcs.net/live/
playpath=soacrussia-high@58777 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn/
playpath=juce_super.sdp
live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn_repeater/
playpath=tbnafrica.stream live=true'
+
+ if settings.getSetting("quality") == '2':
+ match='rtmp://cp114430.live.edgefcs.net/live/
playpath=tbn_mbr_600@101613 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114428.live.edgefcs.net/live/
playpath=churchch_mbr_600@101620 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114432.live.edgefcs.net/live/
playpath=jctv_mbr_600@101615 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114426.live.edgefcs.net/live/
playpath=soac_mbr_600@101622 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114434.live.edgefcs.net/live/
playpath=enlace_mbr_600@101618 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp114436.live.edgefcs.net/live/
playpath=enlacejuvenil_800@102106 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129063.live.edgefcs.net/live/
playpath=nejat_mbr_600@101623 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129064.live.edgefcs.net/live/
playpath=healing_mbr_600@101624 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129065.live.edgefcs.net/live/
playpath=tbnrussia-high@58776 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://cp129066.live.edgefcs.net/live/
playpath=soacrussia-high@58777 pageURL=http://www.tbn.org/watch-us
swfUrl=http://players.edgesuite.net/flash/plugins/osmf/advanced-streaming-plugin/v2.11/osmf2.0/AkamaiAdvancedStreamingPlugin.swf
swfVfy=true live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn/
playpath=juce_super.sdp
live=true','rtmp://mediaplatform2.trinetsolutions.com/tbn_repeater/
playpath=tbnafrica.stream live=true'
title=re.compile('\"name\":\"(.+?)\"').findall(link)
thumbnail=re.compile('\"icon\":\"(.+?)\"').findall(link)
mylist=zip((match),(title),(thumbnail))
for url,name,thumbnail in mylist:
- addLink(name,url,thumbnail)
- if 1==1:
+ addLink(name,url,thumbnail)
+ if 1==1:
xbmc.executebuiltin('Container.SetViewMode(500)')
def SEARCH(url):
@@ -261,8 +272,12 @@ def SEARCH(url):
addDir(name+' - '+description,url,2,thumbnail)
if nextpage:
addDir('Page
'+nextpagelabel,'http://www.itbn.org'+nextpage[0],1,next_thumb)
- if 1==1:
- xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'true':
+ if 1==1:
+
xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'false':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(50)')
else:
MAIN()
@@ -312,7 +327,6 @@ def AIRDATE(url):
previouspagelabel=''.join(str(e) for e in
previouspagelabel)
source=zip((prefix),(match),(suffix))
mylist=zip((source),(name),(thumbnail),(description))
- xbmc.executebuiltin('Container.SetViewMode(500)')
addDir('Main Menu','',None,main_menu_thumb)
if previouspage:
addDir('Page
'+previouspagelabel,'http://www.itbn.org'+previouspage[0],1,next_thumb)
@@ -330,8 +344,12 @@ def AIRDATE(url):
addDir(name+' - '+description,url,2,thumbnail)
if nextpage:
addDir('Page
'+nextpagelabel,'http://www.itbn.org'+nextpage[0],1,next_thumb)
- if 1==1:
- xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'true':
+ if 1==1:
+
xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'false':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(50)')
else:
MAIN()
@@ -361,8 +379,12 @@ def MOVIES(url):
description=description.replace("\\","")
description=description.replace("u2019","\'")
addDir(reduce(lambda rst, d: rst * 1 + d, (name))+' -
'+description,reduce(lambda rst, d: rst * 1 + d, (url)),2,thumbnail)
- if 1==1:
- xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'true':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(500)')
+ if settings.getSetting("thumbnailview") == 'false':
+ if 1==1:
+ xbmc.executebuiltin('Container.SetViewMode(50)')
def get_params():
param=[]
@@ -382,6 +404,10 @@ def get_params():
return param
+def PREVIOUS():
+ xbmc.executebuiltin('Action(Back)')
+
+
def addLink(name,url,iconimage):
ok=True
liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
@@ -463,5 +489,8 @@ elif mode==9:
elif mode==10:
print ""+url
MOVIES(url)
+elif mode==11:
+ print ""+url
+ PREVIOUS()
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.itbn_org/resources/settings.xml
b/plugin.video.itbn_org/resources/settings.xml
index a0a6f18..2cd4313 100644
--- a/plugin.video.itbn_org/resources/settings.xml
+++ b/plugin.video.itbn_org/resources/settings.xml
@@ -1,12 +1,5 @@
-<?xml version ="1.0" encoding="utf-8" standalone="yes"?>
<settings>
-<category label= âGeneralâ>
-<setting id=" username" type="text" label="2 000"
-default ="" />
-<setting id=" password" type="text" option=" hidden "
-label=" 2001" enable ="!eq( -1,)" default="" />
-<setting type ="sep" />
-<setting id="debug" type= "bool" label ="2002 "
-default ="false" />
-</category >
+ <category label="General">
+ <setting id="quality" type="enum" label="Live Stream Quality"
values="Low|Med|High" default="High"/>
+ <setting id="thumbnailview" type="bool" label="Thumbnail View"
default="true" /></category>
</settings>
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=491d8948e03c226127393a49037b210bccd25881
commit 491d8948e03c226127393a49037b210bccd25881
Author: beenje <[email protected]>
Date: Sat Apr 27 20:31:30 2013 +0200
[plugin.video.vgtv] updated to version 2.0.6
diff --git a/plugin.video.vgtv/addon.xml b/plugin.video.vgtv/addon.xml
index 0cebdb7..8e55768 100644
--- a/plugin.video.vgtv/addon.xml
+++ b/plugin.video.vgtv/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vgtv" name="VGTV" version="2.0.5" provider-name="Espen
Hovlandsdal">
+<addon id="plugin.video.vgtv" name="VGTV" version="2.0.6" provider-name="Espen
Hovlandsdal">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="1.1.1"/>
diff --git a/plugin.video.vgtv/changelog.txt b/plugin.video.vgtv/changelog.txt
index e5c5877..5012351 100644
--- a/plugin.video.vgtv/changelog.txt
+++ b/plugin.video.vgtv/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.6[/B]
+- Fixed a bug where videos could not be played if category ID was defined
+
[B]2.0.5[/B]
- Fixed a bug where categories would not be reported correctly
diff --git a/plugin.video.vgtv/resources/lib/api.py
b/plugin.video.vgtv/resources/lib/api.py
index ecfd9d8..8ceb2d9 100644
--- a/plugin.video.vgtv/resources/lib/api.py
+++ b/plugin.video.vgtv/resources/lib/api.py
@@ -223,7 +223,7 @@ class VgtvApi():
url += 'event=videoplay&identification=' + str(id) + '&text1=vgtv-xbmc'
if category is not None:
- url += '&text2=' + category.get('drVideoId')
+ url += '&text2=' + str(category.get('drVideoId'))
try:
urllib2.urlopen(url)
@@ -257,7 +257,7 @@ class VgtvApi():
params = {
's': 417204,
'p': category_name + '::' + str(id) + '_' + title,
- 's2': category.get('drVideoId'),
+ 's2': str(category.get('drVideoId')),
'type': 'video',
'plyr': 2,
'a': 'play',
-----------------------------------------------------------------------
Summary of changes:
plugin.video.itbn_org/addon.xml | 6 ++-
plugin.video.itbn_org/changelog.txt | 7 ++-
plugin.video.itbn_org/default.py | 55 +++++++++++++++-----
.../resources/language/English/strings.xml | 8 ---
plugin.video.itbn_org/resources/settings.xml | 13 +----
plugin.video.vgtv/addon.xml | 2 +-
plugin.video.vgtv/changelog.txt | 3 +
plugin.video.vgtv/resources/lib/api.py | 4 +-
8 files changed, 62 insertions(+), 36 deletions(-)
delete mode 100644 plugin.video.itbn_org/resources/language/English/strings.xml
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
