The branch, eden-pre has been updated
via 5d495fce31ef424241e135f8526ff61e726905c5 (commit)
from 11fd76fd266f2f7e1fe1cc87d81e75bf5ea45e39 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5d495fce31ef424241e135f8526ff61e726905c5
commit 5d495fce31ef424241e135f8526ff61e726905c5
Author: spiff <[email protected]>
Date: Tue Oct 4 09:38:10 2011 +0200
[plugin.video.dr.dk.live] updated to version 2.0.3
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 32029da..5761662 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -55,6 +55,18 @@ CHANNELS = [
Q_HIGH : 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast
Quality',
Q_MEDIUM : 'mms://stream.nordjyske.dk/24nordjyske'
}
+ },
+ {'name' : 'TV2 Nord', 'urls' : {
+ Q_BEST : 'rtmp://80.63.11.91:1935/live/_definst_/tv2nord_2000',
+ Q_HIGH : 'rtmp://80.63.11.91:1935/live/_definst_/tv2nord_1000',
+ Q_MEDIUM : 'rtmp://80.63.11.91:1935/live/_definst_/tv2nord_300'
+ }
+ },
+ {'name' : 'TV2 NordPlus', 'urls' : {
+ Q_BEST :
'rtmp://80.63.11.91:1935/live/_definst_/tv2nord-plus_2000',
+ Q_HIGH :
'rtmp://80.63.11.91:1935/live/_definst_/tv2nord-plus_1000',
+ Q_MEDIUM :
'rtmp://80.63.11.91:1935/live/_definst_/tv2nord-plus_300'
+ }
}]
class DanishLiveTV(object):
@@ -75,7 +87,10 @@ class DanishLiveTV(object):
xbmcplugin.endOfDirectory(HANDLE)
def getUrl(self, urls):
- quality = QUALITIES[int(ADDON.getSetting('quality'))]
+ try:
+ quality = QUALITIES[int(ADDON.getSetting('quality'))]
+ except ValueError:
+ quality = Q_BEST # fallback for old settings value
if urls.has_key(quality):
return urls[quality]
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index c9b77ae..13f4410 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="2.0.2"
+ version="2.0.3"
name="Danish Live TV"
provider-name="twinther [[email protected]]">
<requires>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index 778ea5b..d8e5f83 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 2.0.3 - 2011-10-03[/B]
+- Fixed problem with old settings
+- Added TV2 Nord and TV2 NordPlus streams as a test,
+ they only work when they are broadcasting
+
[B]Version 2.0.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.
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 875cd35..26b51e0 100644
--- a/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
@@ -3,8 +3,8 @@
<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="30110">Bedste (op til 2 mbit/s)</string>
+ <string id="30111">Høj (1 mbit/s)</string>
<string id="30112">Medium (500 kbit/s)</string>
<string id="30113">Lav (250 kbit/s)</string>
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 af3ad38..dcabcaa 100644
--- a/plugin.video.dr.dk.live/resources/language/English/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/English/strings.xml
@@ -3,8 +3,8 @@
<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="30110">Best (up to 2 mbit/s)</string>
+ <string id="30111">High (1 mbit/s)</string>
<string id="30112">Medium (500 kbit/s)</string>
<string id="30113">Low (250 kibt/s)</string>
</strings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.dr.dk.live/addon.py | 17 ++++++++++++++++-
plugin.video.dr.dk.live/addon.xml | 2 +-
plugin.video.dr.dk.live/changelog.txt | 5 +++++
.../resources/language/Danish/strings.xml | 4 ++--
.../resources/language/English/strings.xml | 4 ++--
.../resources/logos/TV2_Nord.png | Bin 0 -> 40483 bytes
.../resources/logos/TV2_NordPlus.png | Bin 0 -> 38515 bytes
7 files changed, 26 insertions(+), 6 deletions(-)
create mode 100644 plugin.video.dr.dk.live/resources/logos/TV2_Nord.png
create mode 100644 plugin.video.dr.dk.live/resources/logos/TV2_NordPlus.png
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
