The branch, dharma has been updated
       via  06ed749ed201de9cd31738cfbf70881a51216d19 (commit)
      from  fb2432b58e607aa6956fdf4d38a9518d782b76d2 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=06ed749ed201de9cd31738cfbf70881a51216d19

commit 06ed749ed201de9cd31738cfbf70881a51216d19
Author: spiff <[email protected]>
Date:   Tue Jan 10 20:45:00 2012 +0100

    [plugin.video.jupiterbroadcasting] updated to version 1.3.0

diff --git a/plugin.video.jupiterbroadcasting/addon.xml 
b/plugin.video.jupiterbroadcasting/addon.xml
index d780426..4e10f3b 100644
--- a/plugin.video.jupiterbroadcasting/addon.xml
+++ b/plugin.video.jupiterbroadcasting/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <addon id="plugin.video.jupiterbroadcasting"

        name="Jupiter Broadcasting"

-       version="1.1.0"

+       version="1.3.0"

        provider-name="Rob Loach">

   <requires>

     <import addon="xbmc.python" version="1.0"/>

diff --git a/plugin.video.jupiterbroadcasting/changelog.txt 
b/plugin.video.jupiterbroadcasting/changelog.txt
index 2c7d37c..9847d41 100644
--- a/plugin.video.jupiterbroadcasting/changelog.txt
+++ b/plugin.video.jupiterbroadcasting/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.3.0[/B]

+- Moved to GitHub for version control

+- New show: Live

+

 [B]Version 1.2.0[/B]

 - Switched to HD video

 - Updated some of the show thumbnail images

diff --git a/plugin.video.jupiterbroadcasting/default.py 
b/plugin.video.jupiterbroadcasting/default.py
index b6b0b15..c84baaa 100644
--- a/plugin.video.jupiterbroadcasting/default.py
+++ b/plugin.video.jupiterbroadcasting/default.py
@@ -66,20 +66,28 @@ def CATEGORIES():
                'plot': 'SciByte is a show about science topics presented by 
Heather and Jeremy.',

                'genre': 'Science'

        }

-       # TODO: Add FauxShow?

+       # @TODO: Add FauxShow?

        #plugins[__language__(30011)] = {

-       #       'feed': 'http://blip.tv/fauxshow/rss',

+       #       'feed': 'http://blip.tv/fauxshow/rss/itunes',

        #       'image': 
'http://images3.wikia.nocookie.net/__cb20110422002134/jupiterbroadcasting/images/0/0b/Fauxshow.jpg',

        #       'plot': 'The FauxShow is not a real show, but a social 
experience. Unlike most of the shows on the network, the FauxShow has no 
defined subject and the topic varies week to week.',

        #       'genre': 'Humour'

        #}

-       x = 1

+

+       # Add Jupiter Broadcasting Live via Justin.tv?

+       info = {}

+       info['title'] = __language__(30010)

+       info['plot'] = __language__(30012)

+       info['genre'] = 'Technology'

+       info['count'] = 1

+       addLink(__language__(30010), 
'rtsp://videocdn-us.geocdn.scaleengine.net/jblive/jblive.stream', '', 
'http://images2.wikia.nocookie.net/__cb20110118004527/jupiterbroadcasting/images/2/24/JupiterBadgeGeneric.jpg',
 info)

+

+  # Loop through each of the shows and add them as directories.

+       x = 2

        for name, data in plugins.iteritems():

                data['count'] = x

                x = x + 1

                addDir(name, data['feed'], 1, data['image'], data)

-       #TODO: Add Jupiter Broadcasting Live via Justin.tv?

-       #addLink(__language__(30010), 
'http://www.justin.tv/widgets/live_embed_player.swf?channel=jupiterbroadcasting',
 '', '', 
'http://www.jupiterbroadcasting.com/wp-content/themes/ondemand/images/logo.jpg')

 

 def INDEX(name, url):

        import feedparser

@@ -104,6 +112,7 @@ def INDEX(name, url):
                info['plotoutline'] = item.subtitle

                info['director'] = item.author

                info['tvshowtitle'] = name

+               # @TODO: Add the icon image screenshot from <media thumbnail>.

                addLink(title, video, date, '', info)

                x = x + 1

 

@@ -133,7 +142,7 @@ def addLink(name, url, date, iconimage, info):
         
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)

         return ok

 

-def addDir(name,url,mode,iconimage, info):

+def addDir(name, url, mode, iconimage, info):

        
u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)+"&name="+urllib.quote_plus(name)

        ok=True

        info["Title"] = name

diff --git 
a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml 
b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
index 005743f..3c8f449 100644
--- a/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
+++ b/plugin.video.jupiterbroadcasting/resources/language/English/strings.xml
@@ -10,6 +10,7 @@
   <string id="30007">The MMOrgue</string>
   <string id="30008">TechSNAP</string>
   <string id="30009">SciByte</string>
-  <string id="30010">Live</string>
+  <string id="30010">Live Show</string>
   <string id="30011">FauxShow</string>
+  <string id="30012">Watch Jupiter Broadcasting live!</string>
 </strings>

-----------------------------------------------------------------------

Summary of changes:
 plugin.video.jupiterbroadcasting/README            |    4 +++
 plugin.video.jupiterbroadcasting/addon.xml         |    2 +-
 plugin.video.jupiterbroadcasting/changelog.txt     |    4 +++
 plugin.video.jupiterbroadcasting/default.py        |   21 ++++++++++++++-----
 .../resources/language/English/strings.xml         |    3 +-
 5 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 plugin.video.jupiterbroadcasting/README


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create 
new or port existing apps to sell to consumers worldwide. Explore the 
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to