The branch, eden-pre has been updated
via d75f88ac76e6c3748761ed4fd30ec8fa4587e45e (commit)
from d0bff5b60df5366c5c9b953ea3d9cf3d5b3682c8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d75f88ac76e6c3748761ed4fd30ec8fa4587e45e
commit d75f88ac76e6c3748761ed4fd30ec8fa4587e45e
Author: spiff <[email protected]>
Date: Fri Feb 17 19:54:47 2012 +0100
[plugin.video.dr.dk.live] updated to version 2.1.2
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 0c95e83..a74488a 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -51,7 +51,10 @@ class DanishLiveTV(object):
idx = None
if channel.get_config_key():
- idx = int(ADDON.getSetting(channel.get_config_key()))
+ try:
+ idx = int(ADDON.getSetting(channel.get_config_key()))
+ except ValueError:
+ idx = 0 # fallback for missing settings
url = channel.get_url(quality, idx)
if url:
@@ -85,7 +88,12 @@ class DanishLiveTV(object):
for channel in CHANNELS:
if str(channel.get_id()) == id:
- url = channel.get_url(quality)
+ try:
+ idx = int(ADDON.getSetting(channel.get_config_key()))
+ except ValueError:
+ idx = 0 # fallback for missing settings
+
+ url = channel.get_url(quality, idx)
if url:
icon = os.path.join(ADDON.getAddonInfo('path'),
'resources', 'logos', '%d.png' % channel.get_id())
if not os.path.exists(icon):
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index 5fcde1a..39e72c2 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
- id="plugin.video.dr.dk.live" version="2.1.1" name="Danish Live TV"
provider-name="twinther [[email protected]]">
+ id="plugin.video.dr.dk.live" version="2.1.2" name="Danish Live TV"
provider-name="twinther [[email protected]]">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index 6009602..4ce1ef9 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 2.1.2 - 2011-02-05[/B]
+- Avoid problem with missing settings
+- Fixed use of secondary streams from external addons (fx TV Guide)
+
[B]Version 2.1.1 - 2011-01-30[/B]
- Fixed DR HD high-quality stream
- Added TV2/Bornholm and TV/MIDT-VEST
-----------------------------------------------------------------------
Summary of changes:
plugin.video.dr.dk.live/addon.py | 12 ++++++++++--
plugin.video.dr.dk.live/addon.xml | 2 +-
plugin.video.dr.dk.live/changelog.txt | 4 ++++
3 files changed, 15 insertions(+), 3 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
