[Xbmc-addons] Plugins branch, dharma, updated. 04c83b98219f337966fd35f4ed45976d6f062c74

Wed, 28 Sep 2011 00:07:48 -0700 

The branch, dharma has been updated
       via  04c83b98219f337966fd35f4ed45976d6f062c74 (commit)
      from  24d03842fc9fe033279d1df28bb855b5c7d52b99 (commit)

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

commit 04c83b98219f337966fd35f4ed45976d6f062c74
Author: spiff <[email protected]>
Date:   Wed Sep 28 09:04:04 2011 +0200

    [plugin.video.dr.dk.live] updated to version 1.3.2

diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index c79b839..32029da 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -1,100 +1,95 @@
 import sys
-import cgi as urlparse
+import os
 
-import xbmc
 import xbmcaddon
 import xbmcgui
 import xbmcplugin
 
-# High   : 1000 kb/s
-# Medium :  500 kb/s
-# Low    :  300 kb/s
+Q_BEST = 0   # 1700 kb/s
+Q_HIGH = 1   # 1000 kb/s
+Q_MEDIUM = 2 # 500 kb/s
+Q_LOW = 3    # 250 kb/s
+
+QUALITIES = [Q_BEST, Q_HIGH, Q_MEDIUM, Q_LOW]
 
 CHANNELS = [
     # From: http://dr.dk/nu/embed/live?height=467&width=830
     {'name' : 'DR1', 'urls' : {
-            'high' : 'rtmp://rtmplive.dr.dk/live/livedr01astream3',
-            'medium' : 'rtmp://rtmplive.dr.dk/live/livedr01astream2',
-            'low' : 'rtmp://rtmplive.dr.dk/live/livedr01astream1'
+            Q_HIGH : 'rtmp://rtmplive.dr.dk/live/livedr01astream3',
+            Q_MEDIUM : 'rtmp://rtmplive.dr.dk/live/livedr01astream2',
+            Q_LOW : 'rtmp://rtmplive.dr.dk/live/livedr01astream1'
         }
     },
     {'name' : 'DR2', 'urls' : {
-            'high' : 'rtmp://rtmplive.dr.dk/live/livedr02astream3',
-            'medium' : 'rtmp://rtmplive.dr.dk/live/livedr02astream2',
-            'low' : 'rtmp://rtmplive.dr.dk/live/livedr02astream1'
+            Q_HIGH : 'rtmp://rtmplive.dr.dk/live/livedr02astream3',
+            Q_MEDIUM : 'rtmp://rtmplive.dr.dk/live/livedr02astream2',
+            Q_LOW : 'rtmp://rtmplive.dr.dk/live/livedr02astream1'
         }
     },
     {'name' : 'DR Update', 'urls' : {
-            'high' : 'rtmp://rtmplive.dr.dk/live/livedr03astream3',
-            'medium' : 'rtmp://rtmplive.dr.dk/live/livedr03astream2',
-            'low' : 'rtmp://rtmplive.dr.dk/live/livedr03astream1'
+            Q_HIGH : 'rtmp://rtmplive.dr.dk/live/livedr03astream3',
+            Q_MEDIUM : 'rtmp://rtmplive.dr.dk/live/livedr03astream2',
+            Q_LOW : 'rtmp://rtmplive.dr.dk/live/livedr03astream1'
         }
     },
     {'name' : 'DR K', 'urls' : {
-            'high' : 'rtmp://rtmplive.dr.dk/live/livedr04astream3',
-            'medium' : 'rtmp://rtmplive.dr.dk/live/livedr04astream2',
-            'low' : 'rtmp://rtmplive.dr.dk/live/livedr04astream1'
+            Q_HIGH : 'rtmp://rtmplive.dr.dk/live/livedr04astream3',
+            Q_MEDIUM : 'rtmp://rtmplive.dr.dk/live/livedr04astream2',
+            Q_LOW : 'rtmp://rtmplive.dr.dk/live/livedr04astream1'
         }
     },
     {'name' : 'DR Ramasjang', 'urls' : {
-            'high' : 'rtmp://rtmplive.dr.dk/live/livedr05astream3',
-            'medium' : 'rtmp://rtmplive.dr.dk/live/livedr05astream2',
-            'low' : 'rtmp://rtmplive.dr.dk/live/livedr05astream1'
+            Q_HIGH : 'rtmp://rtmplive.dr.dk/live/livedr05astream3',
+            Q_MEDIUM : 'rtmp://rtmplive.dr.dk/live/livedr05astream2',
+            Q_LOW : 'rtmp://rtmplive.dr.dk/live/livedr05astream1'
         }
     },
     {'name' : 'DR HD', 'urls' : {
-            'high' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream3',
-            'medium' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream2',
-            'low' : 'rtmp://livetv.gss.dr.dk/live/livedr06astream1'
+            Q_BEST : 'rtmp://livetv.gss.dr.dk/live/livedr06astream3',
+            Q_HIGH : 'rtmp://livetv.gss.dr.dk/live/livedr06astream2',
+            Q_MEDIUM : 'rtmp://livetv.gss.dr.dk/live/livedr06astream1'
         }
     },
     # From: http://www.24nordjyske.dk/webtv_high.asp
     {'name' : '24 Nordjyske', 'urls' : {
-            'high' : 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast 
Quality',
-            'medium' : 'mms://stream.nordjyske.dk/24nordjyske'
+            Q_HIGH : 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast 
Quality',
+            Q_MEDIUM : 'mms://stream.nordjyske.dk/24nordjyske'
         }
-    }
-    ]
-
-def showChannels():
-    fanart = ADDON.getAddonInfo('path') + '/fanart.jpg'
-    for idx, c in enumerate(CHANNELS):
-        icon = ADDON.getAddonInfo('path') + "/resources/logos/" + 
c['name'].replace(" ", "_") + ".png"
-
-        if c['urls'].has_key(getQuality()):
-            item = xbmcgui.ListItem(c['name'], iconImage = icon)
-            item.setProperty('Fanart_Image', fanart)
-            url = PATH + '?idx=' + str(idx)
-            xbmcplugin.addDirectoryItem(HANDLE, url, item, True)
-
-    xbmcplugin.endOfDirectory(HANDLE)
+    }]
 
-def playChannel(idx):
-    c = CHANNELS[int(idx)]
-    q = getQuality()
+class DanishLiveTV(object):
+    def showChannels(self):
+        for c in CHANNELS:
+            icon = os.path.join(ADDON.getAddonInfo('path'), 'resources' 
,'logos', c['name'].replace(' ', '_') + '.png')
 
-    icon = ADDON.getAddonInfo('path') + "/resources/logos/" + 
c['name'].replace(" ", "_") + ".png"
+            url = self.getUrl(c['urls'])
+            if url:
+                item = xbmcgui.ListItem(c['name'], iconImage = icon, 
thumbnailImage = icon)
+                item.setInfo('video', infoLabels = {
+                    'title' : c['name']
+                })
+                item.setProperty('Fanart_Image', FANART)
+                item.setProperty('IsLive', 'true')
+                xbmcplugin.addDirectoryItem(HANDLE, url, item)
 
-    if c['urls'].has_key(q):
-        item = xbmcgui.ListItem(c['name'], thumbnailImage = icon)
-        item.setProperty("IsLive", "true")
-        xbmc.Player().play(c['urls'][q], item)
-    else:
-        d = xbmcgui.Dialog()
-        d.ok(c['name'], ADDON.getLocalizedString(30001) % q.capitalize(), 
ADDON.getLocalizedString(30002))
+        xbmcplugin.endOfDirectory(HANDLE)
 
-def getQuality():
-    return ADDON.getSetting('quality').lower()
+    def getUrl(self, urls):
+        quality = QUALITIES[int(ADDON.getSetting('quality'))]
 
+        if urls.has_key(quality):
+            return urls[quality]
+        elif quality == Q_BEST and urls.has_key(Q_HIGH):
+            return urls[Q_HIGH]
+        else:
+            return None
 
 if __name__ == '__main__':
     ADDON = xbmcaddon.Addon(id = 'plugin.video.dr.dk.live')
     PATH = sys.argv[0]
     HANDLE = int(sys.argv[1])
-    PARAMS = urlparse.parse_qs(sys.argv[2][1:])
+    FANART = os.path.join(ADDON.getAddonInfo('path'), 'fanart.jpg')
 
-    if PARAMS.has_key('idx'):
-        playChannel(PARAMS['idx'][0])
-    else:
-        showChannels()
+    dktv = DanishLiveTV()
+    dktv.showChannels()
 
diff --git a/plugin.video.dr.dk.live/addon.xml 
b/plugin.video.dr.dk.live/addon.xml
index 5d57bb4..a147772 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
        id="plugin.video.dr.dk.live"
-       version="1.3.1"
+       version="1.3.2"
        name="Danish Live TV"
        provider-name="twinther [[email protected]]">
        <requires>
@@ -13,8 +13,8 @@
        <extension point="xbmc.addon.metadata">
                <summary lang="en">Watch Danish Live TV</summary>
                <summary lang="da">Se dansk Live TV</summary>
-               <description lang="en">Live steams for[CR]DR1[CR]DR2[CR]DR 
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske</description>
-               <description lang="da">Live steams for[CR]DR1[CR]DR2[CR]DR 
Update[CR]DR K[CR]DR Ramasjang[CR]24 Nordjyske</description>
+               <description lang="en">Live steams for[CR]DR1[CR]DR2[CR]DR 
Update[CR]DR K[CR]DR Ramasjang[CR]DR HD[CR]24 Nordjyske</description>
+               <description lang="da">Live steams for[CR]DR1[CR]DR2[CR]DR 
Update[CR]DR K[CR]DR Ramasjang[CR]DR HD[CR]24 Nordjyske</description>
         <disclaimer lang="en">Some parts of this addon may not be legal in 
your country of residence - please check with your local laws.</disclaimer>
         <disclaimer lang="da">Nogle dele af denne addon er muligvis ikke 
lovlig i dit land - kontroller venligst dine lokale love.</disclaimer>
                <license>GPL 2.0</license>
diff --git a/plugin.video.dr.dk.live/changelog.txt 
b/plugin.video.dr.dk.live/changelog.txt
index 032694e..2b04107 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.d.live/changelog.txtg.txt 
b/plugin.video.dr.dk.live/changelog.txt- kontroller venligst dine lokale 
love.</disclaimer>imer>\LÁ*€š]LÁ*•}LÁ*’ˆyMÁ*€¶úÿ€ ›MÁ*p¶úÿ@¶úÿk\LÁ*6
 
èè!è!¶úÿ€¶úÿxDyMÁ*p¶úÿ’r\LÁ*†\LÁ*¶úÿ`r\LÁ*O¶úÿÀ?ÝMÁ*uz\LÁ*0ÝMÁ*Ø4ÝMÁ*¨9ÝMÁ*€š]LÁ*xDyMÁ*p¶úÿ@¶úÿk\LÁ*à!à!¶úÿ€¶úÿHYMÁ*P¶úÿ’r\LÁ*†\LÁ*¶úÿ`r\LÁ*O¶úÿ@¶úÿ8¶úÿ8›}LÁ*Œp˜€¶úÿuz\LÁ*€š]LÁ*P¶úÿ
 
¶úÿk\LÁ*GHIJKMNOP¶úÿ€¶úÿHÅ/MÁ*ð¶úÿ’r\LÁ*†\LÁ*¶úÿ0?ÝMÁ*uz\LÁ*PyMÁ* ù

MÁ*0ÝMÁ*Ø4ÝMÁ*¨9ÝMÁ*€š]LÁ*HÅ/MÁ*ð¶úÿ0¶úÿk\LÁ*8Å/MÁ*ð¶úÿ`¶úÿk\LÁ*(Å/MÁ*ð¶úÿ¶úÿk\LÁ*Å/MÁ*ð¶úÿÀ¶úÿk\LÁ*
 ¨>ÝMÁ*uz\LÁ*¨9ÝMÁ*@¶úÿŠH
MÁ*ey\LÁ*Ø4ÝMÁ*`¶úÿyH
MÁ*ey\LÁ*0ÝMÁ*¶úÿZH
MÁ*ey\LÁ*ØôMÁ*PyMÁ* ù
MÁ*0ÝMÁ*ØTyMÁ*Ø4ÝMÁ*¨9ÝMÁ*€š]LÁ*8›}LÁ*½ØLÁ*€¶úÿp‹

MÁ*@¶úÿ¶úÿk\LÁ*5678:<=>?@BD¶úÿ€¶úÿà½ÕLÁ*€¶úÿuz\LÁ*•}LÁ*À¶úÿ½ØLÁ*ey\LÁ*•}LÁ*Õ_@fÆS
 Qöl±íÁÓ¤LÁ*€¶úÿà½ÕLÁ*P  ¶úÿ 
¶úÿk\LÁ*u]ÞÓ      
4Q ÷U^Qʉ§¶uª¹ñìò*ēv¶úÿ€¶úÿH¢LÁ*TÞLÁ*À¶úÿ¦`@NÁ*¦`@NÁ*¦ÛLÁ*O¶úÿ€¶úÿ8¶úÿ 
¶úÿ_yMÁ*uz\LÁ*ØTyMÁ*¶úÿ¢`@NÁ*жúÿ`¶úÿÿÿÿÿÿÿÿÿ¢`@NÁ*ˆ¶úÿk.live/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.3.2 - 2011-09-27[/B]
+- Added [I]Best[/I] quality to play streams at best quality available
+- Changed [I]High[/I] quality to play streams at 1 mbit/s useful for ATV1 
users, etc.
+
 [B]Version 1.3.1 - 2011-09-20[/B]
 - Added DR HD
 - New graphics
diff --git a/plugin.video.dr.dk.live/resources/language/Danish/strings.xml 
b/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
index 6b723d8..875cd35 100644
--- a/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
-       <string id="30001">Denne kanal kan ikke afspilles i %s 
kvalitet.</string>
-    <string id="30002">Skift kvalitet i indstillingerne og prøv igen.</string>
     <string id="30100">Generelt</string>
     <string id="30101">Kvalitet</string>
+
+    <string id="30110">Bedste (op til 1.7 mbit/s)</string>
+    <string id="30111">Høj (1.0 mbit/s)</string>
+    <string id="30112">Medium (500 kbit/s)</string>
+    <string id="30113">Lav (250 kbit/s)</string>
+
 </strings>
diff --git a/plugin.video.dr.dk.live/resources/language/English/strings.xml 
b/plugin.video.dr.dk.live/resources/language/English/strings.xml
index 8ff73c4..af3ad38 100644
--- a/plugin.video.dr.dk.live/resources/language/English/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/English/strings.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
-       <string id="30001">This channel is not available in %s quality.</string>
-    <string id="30002">Change the quality setting and try again.</string>
     <string id="30100">General</string>
     <string id="30101">Quality</string>
+
+    <string id="30110">Best (up to 1.7 mbit/s)</string>
+    <string id="30111">High (1.0 mbit/s)</string>
+    <string id="30112">Medium (500 kbit/s)</string>
+    <string id="30113">Low (250 kibt/s)</string>
 </strings>
diff --git a/plugin.video.dr.dk.live/resources/settings.xml 
b/plugin.video.dr.dk.live/resources/settings.xml
index 05eba61..f8b9fee 100644
--- a/plugin.video.dr.dk.live/resources/settings.xml
+++ b/plugin.video.dr.dk.live/resources/settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <settings>
        <category label="30100">
-               <setting id="quality" label="30101" type="labelenum" 
default="High" values="High|Medium|Low" />
+               <setting id="quality" label="30101" type="enum" default="0" 
lvalues="30110|30111|30112|30113" />
        </category>
 </settings>
 

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

Summary of changes:
 plugin.video.dr.dk.live/addon.py                   |  111 +++++++++----------
 plugin.video.dr.dk.live/addon.xml                  |    6 +-
 plugin.video.dr.dk.live/changelog.txt              |    4 +
 .../resources/language/Danish/strings.xml          |    8 +-
 .../resources/language/English/strings.xml         |    7 +-
 plugin.video.dr.dk.live/resources/settings.xml     |    2 +-
 6 files changed, 72 insertions(+), 66 deletions(-)


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to