The branch, frodo has been updated
via e5b38e1dcd57f8cec457f845f1aa5b0c304308a6 (commit)
from 57f758b14dec8275f9e2b747b806559413aa4fe4 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e5b38e1dcd57f8cec457f845f1aa5b0c304308a6
commit e5b38e1dcd57f8cec457f845f1aa5b0c304308a6
Author: beenje <[email protected]>
Date: Wed May 8 19:46:07 2013 +0200
[plugin.video.itbn_org] updated to version 1.2.2
diff --git a/plugin.video.itbn_org/addon.xml b/plugin.video.itbn_org/addon.xml
index 767af2e..22a5d25 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.1"
+ version="1.2.2"
name="iTBN"
provider-name="Romans I XVI"
>
diff --git a/plugin.video.itbn_org/changelog.txt
b/plugin.video.itbn_org/changelog.txt
index 45e0e83..2fd894a 100644
--- a/plugin.video.itbn_org/changelog.txt
+++ b/plugin.video.itbn_org/changelog.txt
@@ -17,3 +17,6 @@ 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.
+
+version 1.2.2
+-Fixed a error with the settings not loading correctly after updating to frodo
12.2
diff --git a/plugin.video.itbn_org/default.py b/plugin.video.itbn_org/default.py
index 340e9dc..afcf8b4 100644
--- a/plugin.video.itbn_org/default.py
+++ b/plugin.video.itbn_org/default.py
@@ -82,10 +82,10 @@ 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 settings.getSetting("thumbnailview") == 'true':
+ if settings.getSetting("thumbnailviewmode") == 'true':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(500)')
- if settings.getSetting("thumbnailview") == 'false':
+ if settings.getSetting("thumbnailviewmode") == 'false':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(50)')
@@ -195,12 +195,12 @@ def LIVE(url):
response = urllib2.urlopen(req)
link=response.read()
response.close()
- if settings.getSetting("quality") == '0':
+ if settings.getSetting("livequality") == '0':
match=re.compile('\"andsuperstreamurl\":\"(.+?)\"').findall(link)
- if settings.getSetting("quality") == '1':
+ if settings.getSetting("livequality") == '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':
+ if settings.getSetting("livequality") == '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)
@@ -272,10 +272,10 @@ def SEARCH(url):
addDir(name+' - '+description,url,2,thumbnail)
if nextpage:
addDir('Page
'+nextpagelabel,'http://www.itbn.org'+nextpage[0],1,next_thumb)
- if settings.getSetting("thumbnailview") == 'true':
+ if settings.getSetting("thumbnailviewmode") == 'true':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(500)')
- if settings.getSetting("thumbnailview") == 'false':
+ if settings.getSetting("thumbnailviewmode") == 'false':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(50)')
else:
@@ -344,10 +344,10 @@ def AIRDATE(url):
addDir(name+' - '+description,url,2,thumbnail)
if nextpage:
addDir('Page
'+nextpagelabel,'http://www.itbn.org'+nextpage[0],1,next_thumb)
- if settings.getSetting("thumbnailview") == 'true':
+ if settings.getSetting("thumbnailviewmode") == 'true':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(500)')
- if settings.getSetting("thumbnailview") == 'false':
+ if settings.getSetting("thumbnailviewmode") == 'false':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(50)')
else:
@@ -379,10 +379,10 @@ 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 settings.getSetting("thumbnailview") == 'true':
+ if settings.getSetting("thumbnailviewmode") == 'true':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(500)')
- if settings.getSetting("thumbnailview") == 'false':
+ if settings.getSetting("thumbnailviewmode") == 'false':
if 1==1:
xbmc.executebuiltin('Container.SetViewMode(50)')
diff --git a/plugin.video.itbn_org/resources/settings.xml
b/plugin.video.itbn_org/resources/settings.xml
index 2cd4313..36c33a7 100644
--- a/plugin.video.itbn_org/resources/settings.xml
+++ b/plugin.video.itbn_org/resources/settings.xml
@@ -1,5 +1,5 @@
<settings>
<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>
+ <setting id="livequality" type="enum" label="Live Stream Quality"
values="Low|Med|High" default="2"/>
+ <setting id="thumbnailviewmode" type="bool" label="Thumbnail View"
default="true" /></category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.itbn_org/addon.xml | 2 +-
plugin.video.itbn_org/changelog.txt | 3 +++
plugin.video.itbn_org/default.py | 22 +++++++++++-----------
plugin.video.itbn_org/resources/settings.xml | 4 ++--
4 files changed, 17 insertions(+), 14 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
