The branch, frodo has been updated
via 78041adbbbb84cafb70ad9e32f9efcab9f5b2573 (commit)
from f5336d81f41cb55c351e501285657e3f9a1a8397 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=78041adbbbb84cafb70ad9e32f9efcab9f5b2573
commit 78041adbbbb84cafb70ad9e32f9efcab9f5b2573
Author: sphere <[email protected]>
Date: Fri May 9 10:33:06 2014 +0200
[plugin.video.dr.dk.live] updated to version 3.1.0
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 648788a..f6b0bb2 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -21,7 +21,6 @@ import sys
import os
import urlparse
import urllib2
-import platform
import xbmcaddon
import xbmcgui
@@ -29,84 +28,63 @@ import xbmcplugin
import buggalo
-from channels import CHANNELS, CATEGORIES, QUALITIES, Q_BEST, Q_RASPBERRY_PI
+from channels import CHANNELS, CATEGORIES
TITLE_OFFSET = 30500
def showChannels(category=None):
- try:
- quality = QUALITIES[int(ADDON.getSetting('quality'))]
- except ValueError:
- quality = QUALITIES[Q_BEST] # fallback for old settings value
-
if category is not None:
channels = CATEGORIES[category]
else:
channels = CHANNELS
- for channel in channels:
- icon = os.path.join(ADDON.getAddonInfo('path'), 'resources', 'logos',
'%d.png' % channel.category_id)
+ for c in channels:
+ channel = c
+ """:type : channels.Channel"""
+ icon = os.path.join(ADDON.getAddonInfo('path'), 'resources', 'logos',
'%d.png' % channel.channel_id)
if not os.path.exists(icon):
icon = ICON
- idx = None
- if channel.config_key:
- try:
- idx = int(ADDON.getSetting(channel.config_key))
- except ValueError:
- idx = 0 # fallback for missing settings
-
- if channel.get_url(quality, idx):
- title = ADDON.getLocalizedString(TITLE_OFFSET +
channel.category_id)
- item = xbmcgui.ListItem(title, iconImage=icon, thumbnailImage=icon)
- item.setInfo('video', infoLabels={
- 'title': title,
- 'studio': ADDON.getLocalizedString(channel.category)
- })
- if channel.fanart is not None:
- item.setProperty('Fanart_Image', channel.fanart)
- else:
- item.setProperty('Fanart_Image', FANART)
- item.setProperty('IsPlayable', 'true')
- xbmcplugin.addDirectoryItem(HANDLE, PATH + '?playChannel=%d' %
channel.category_id, item)
+ title = ADDON.getLocalizedString(TITLE_OFFSET + channel.channel_id)
+ item = xbmcgui.ListItem(title, iconImage=icon, thumbnailImage=icon)
+ item.setInfo('video', infoLabels={
+ 'title': title,
+ 'studio': ADDON.getLocalizedString(channel.category)
+ })
+ if channel.fanart is not None:
+ item.setProperty('Fanart_Image', channel.fanart)
+ else:
+ item.setProperty('Fanart_Image', FANART)
+ item.setProperty('IsPlayable', 'true')
+ xbmcplugin.addDirectoryItem(HANDLE, PATH + '?playChannel=%d' %
channel.channel_id, item)
xbmcplugin.endOfDirectory(HANDLE)
def showCategories():
- for id in CATEGORIES:
- title = ADDON.getLocalizedString(id)
+ for category in CATEGORIES:
+ title = ADDON.getLocalizedString(category)
item = xbmcgui.ListItem(title, iconImage=ICON, thumbnailImage=ICON)
item.setProperty('Fanart_Image', FANART)
- url = PATH + '?category=%d' % id
+ url = PATH + '?category=%d' % category
xbmcplugin.addDirectoryItem(HANDLE, url, item, isFolder=True)
xbmcplugin.endOfDirectory(HANDLE)
-def playChannel(id):
- try:
- quality = QUALITIES[int(ADDON.getSetting('quality'))]
- except ValueError:
- quality = QUALITIES[Q_BEST] # fallback for old settings value
-
- for channel in CHANNELS:
- if str(channel.category_id) == id:
- idx = None
- if channel.config_key:
- try:
- idx = int(ADDON.getSetting(channel.config_key))
- except ValueError:
- idx = 0 # fallback for missing settings
-
- url = channel.get_url(quality, idx)
+def playChannel(channel_id):
+ for c in CHANNELS:
+ channel = c
+ """:type : channels.Channel"""
+ if str(channel.channel_id) == channel_id:
+ url = channel.get_url()
if url:
- icon = os.path.join(ADDON.getAddonInfo('path'), 'resources',
'logos', '%d.png' % channel.category_id)
+ icon = os.path.join(ADDON.getAddonInfo('path'), 'resources',
'logos', '%d.png' % channel.channel_id)
if not os.path.exists(icon):
icon = ICON
- title = ADDON.getLocalizedString(TITLE_OFFSET +
channel.category_id)
+ title = ADDON.getLocalizedString(TITLE_OFFSET +
channel.channel_id)
item = xbmcgui.ListItem(title, iconImage=icon,
thumbnailImage=icon, path=url)
item.setProperty('Fanart_Image', FANART)
item.setProperty('IsLive', 'true')
@@ -139,15 +117,6 @@ def imInDenmark():
ADDON.setSetting('warn.if.not.in.denmark', 'false')
-def isRaspberryPi():
- # inspired by plugin.image.xzen
- try:
- uname = platform.uname()
- except:
- uname = os.uname()
-
- return 'raspbmc' in uname or 'armv6l' in uname
-
if __name__ == '__main__':
ADDON = xbmcaddon.Addon()
PATH = sys.argv[0]
@@ -159,18 +128,11 @@ if __name__ == '__main__':
buggalo.SUBMIT_URL = 'http://tommy.winther.nu/exception/submit.php'
try:
- if ADDON.getSetting('quality') == '':
- # set default value based on what we are able to detect
- if isRaspberryPi():
- ADDON.setSetting('quality', str(Q_RASPBERRY_PI))
- else:
- ADDON.setSetting('quality', str(Q_BEST))
-
if 'playChannel' in PARAMS:
playChannel(PARAMS['playChannel'][0])
elif 'category' in PARAMS:
showChannels(int(PARAMS['category'][0]))
- elif ADDON.getSetting('group.by.category') == 'true' and
ADDON.getSetting('raspberry.pi.compatible.streams') == 'false':
+ elif ADDON.getSetting('group.by.category') == 'true':
imInDenmark()
showCategories()
else:
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index e3315f3..6115ba7 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="3.0.5" name="Danish Live TV"
provider-name="twinther">
+ id="plugin.video.dr.dk.live" version="3.1.0" name="Danish Live TV"
provider-name="twinther">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.buggalo" version="1.1.5"/>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index c2b7b34..77abb22 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,9 @@
+[B]Version 3.1.0 - 2014-05-03[/B]
+- Switched DR streams to Akamai HD
+ (and dropped old streams as they are not working anymore)
+- Removed quality and DR specific settings
+ Only best quality stream is available now
+
[B]Version 3.0.5 - 2014-03-10[/B]
- Fixed missing text in settings
diff --git a/plugin.video.dr.dk.live/channels.py
b/plugin.video.dr.dk.live/channels.py
index 41202dc..5f792ba 100644
--- a/plugin.video.dr.dk.live/channels.py
+++ b/plugin.video.dr.dk.live/channels.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2013 Tommy Winther
+# Copyright (C) 2014 Tommy Winther
# http://tommy.winther.nu
#
# This Program is free software; you can redistribute it and/or modify
@@ -19,14 +19,6 @@
#
import urllib2
-Q_BEST = 0 # 1700 kb/s
-Q_HIGH = 1 # 1000 kb/s
-Q_MEDIUM = 2 # 500 kb/s
-Q_LOW = 3 # 250 kb/s
-Q_RASPBERRY_PI = 4 # Raspberry Pi specific stream
-
-QUALITIES = [Q_BEST, Q_HIGH, Q_MEDIUM, Q_LOW, Q_RASPBERRY_PI]
-
CHANNELS = list()
CATEGORY_DR = 30201
@@ -36,56 +28,22 @@ CATEGORIES = {CATEGORY_DR: [], CATEGORY_TV2_REG: [],
CATEGORY_MISC: []}
class Channel(object):
- def __init__(self, category_id, category, config_key=None):
- self.category_id = category_id
+ def __init__(self, channel_id, category, url, fanart=None):
+ self.channel_id = channel_id
self.category = category
- self.config_key = config_key
- self.urls = dict()
- self.fanart = None
+ self.url = url
+ self.fanart = fanart
CHANNELS.append(self)
CATEGORIES[category].append(self)
- def add_urls(self, best=None, high=None, medium=None, low=None,
raspberryPi=None, fanart=None):
- if best:
- self.urls[Q_BEST] = best
- if high:
- self.urls[Q_HIGH] = high
- if medium:
- self.urls[Q_MEDIUM] = medium
- if low:
- self.urls[Q_LOW] = low
- if raspberryPi:
- self.urls[Q_RASPBERRY_PI] = raspberryPi
- self.fanart = fanart
-
- def get_url(self, quality, idx=Q_BEST):
- if quality in self.urls:
- urls = self.urls[quality]
- elif quality == Q_RASPBERRY_PI:
- if Q_BEST in self.urls:
- urls = self.urls[Q_BEST]
- elif Q_HIGH in self.urls:
- urls = self.urls[Q_HIGH]
- else:
- return None
- elif quality == Q_BEST and Q_HIGH in self.urls:
- urls = self.urls[Q_HIGH]
- else:
- return None
-
- if type(urls) == list:
- if len(urls) > idx:
- return urls[idx]
- else:
- return urls[0]
- else:
- return urls
+ def get_url(self):
+ return self.url
class TV2RChannel(Channel):
- def get_url(self, quality, idx=Q_BEST):
- url = super(TV2RChannel, self).get_url(quality, idx)
+ def get_url(self):
+ url = super(TV2RChannel, self).get_url()
if url is not None:
return url.replace('<HOST>', self.get_host_ip())
else:
@@ -104,114 +62,49 @@ class TV2RChannel(Channel):
#
http://www.dr.dk/mu/Bundle?ChannelType=%24eq%28%22TV%22%29&BundleType=%24eq%28%22Channel%22%29&DrChannel=true&limit=0
# DR1
-Channel(1, CATEGORY_DR, "dr1.stream").add_urls(
- high=['rtmp://livetv.gss.dr.dk/live/livedr01astream3 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr01bstream3 live=1'],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr01astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr01bstream2 live=1'],
- low=['rtmp://livetv.gss.dr.dk/live/livedr01astream1 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr01bstream1 live=1'],
-
raspberryPi='http://dr01-lh.akamaihd.net/i/dr01_0@147054/master.m3u8?b=100-2000',
- fanart='http://www.dr.dk/mu/Asset?Id=52d3f40f6187a2077cbac703')
+Channel(1, CATEGORY_DR,
+
url='http://dr01-lh.akamaihd.net/i/dr01_0@147054/master.m3u8?b=100-2000',
+ fanart='http://www.dr.dk/mu/Asset?Id=52d3f40f6187a2077cbac703')
# DR2
-Channel(2, CATEGORY_DR, "dr2.stream").add_urls(
- high=['rtmp://livetv.gss.dr.dk/live/livedr02astream3 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr02bstream3 live=1'],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr02astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr02bstream2 live=1'],
- low=['rtmp://livetv.gss.dr.dk/live/livedr02astream1 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr02bstream1 live=1'],
-
raspberryPi='http://dr02-lh.akamaihd.net/i/dr02_0@147055/master.m3u8?b=100-2000',
- fanart='http://www.dr.dk/mu/Asset?Id=52d3f5e66187a2077cbac70c')
+Channel(2, CATEGORY_DR,
+
url='http://dr02-lh.akamaihd.net/i/dr02_0@147055/master.m3u8?b=100-2000',
+ fanart='http://www.dr.dk/mu/Asset?Id=52d3f5e66187a2077cbac70c')
# DR 3
-Channel(6, CATEGORY_DR, "dr3.stream").add_urls(
- best=['rtmp://livetv.gss.dr.dk/live/livedr06astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr06bstream2 live=1'],
- high=['rtmp://livetv.gss.dr.dk/live/livedr06astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr06bstream2 live=1'],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr06astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr06bstream2 live=1'],
-
raspberryPi='http://dr03-lh.akamaihd.net/i/dr03_0@147056/master.m3u8?b=100-1600',
- fanart='http://www.dr.dk/mu/Asset?Id=52d3f60da11f9d0f50f56fd3')
+Channel(6, CATEGORY_DR,
+
url='http://dr03-lh.akamaihd.net/i/dr03_0@147056/master.m3u8?b=100-1600',
+ fanart='http://www.dr.dk/mu/Asset?Id=52d3f60da11f9d0f50f56fd3')
# DR Ultra
-Channel(3, CATEGORY_DR, "drultra.stream").add_urls(
- high=['rtmp://livetv.gss.dr.dk/live/livedr03astream3 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr03bstream3 live=1', ],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr03astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr03bstream2 live=1'],
- low=['rtmp://livetv.gss.dr.dk/live/livedr03astream1 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr03bstream1 live=1'],
-
raspberryPi='http://dr06-lh.akamaihd.net/i/dr06_0@147059/master.m3u8?b=100-1600',
- fanart='http://www.dr.dk/mu/bar/52d3f6c6a11f9d0f50f56fde')
+Channel(3, CATEGORY_DR,
+
url='http://dr06-lh.akamaihd.net/i/dr06_0@147059/master.m3u8?b=100-1600',
+ fanart='http://www.dr.dk/mu/bar/52d3f6c6a11f9d0f50f56fde')
# DR K
-Channel(4, CATEGORY_DR, "drk.stream").add_urls(
- high=['rtmp://livetv.gss.dr.dk/live/livedr04astream3 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr04bstream3 live=1'],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr04astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr04bstream2 live=1'],
- low=['rtmp://livetv.gss.dr.dk/live/livedr04astream1 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr04bstream1 live=1'],
-
raspberryPi='http://dr04-lh.akamaihd.net/i/dr04_0@147057/master.m3u8?b=100-1600',
- fanart='http://www.dr.dk/mu/Asset?Id=52d3f685a11f9d0f50f56fd6')
+Channel(4, CATEGORY_DR,
+
url='http://dr04-lh.akamaihd.net/i/dr04_0@147057/master.m3u8?b=100-1600',
+ fanart='http://www.dr.dk/mu/Asset?Id=52d3f685a11f9d0f50f56fd6')
# DR Ramasjang
-Channel(5, CATEGORY_DR, "drramasjang.stream").add_urls(
- high=['rtmp://livetv.gss.dr.dk/live/livedr05astream3 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr05bstream3 live=1'],
- medium=['rtmp://livetv.gss.dr.dk/live/livedr05astream2 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr05bstream2 live=1'],
- low=['rtmp://livetv.gss.dr.dk/live/livedr05astream1 live=1',
- 'rtmp://livetv.gss.dr.dk/live/livedr05bstream1 live=1'],
-
raspberryPi='http://dr05-lh.akamaihd.net/i/dr05_0@147058/master.m3u8?b=100-1600',
- fanart='http://www.dr.dk/mu/bar/52d3f6aca11f9d0f50f56fdb')
+Channel(5, CATEGORY_DR,
+
url='http://dr05-lh.akamaihd.net/i/dr05_0@147058/master.m3u8?b=100-1600',
+ fanart='http://www.dr.dk/mu/bar/52d3f6aca11f9d0f50f56fdb')
# TV2 Fyn
-TV2RChannel(100, CATEGORY_TV2_REG).add_urls(
- best='rtmp://<HOST>:1935/live/_definst_/tv2fyn_2000 live=1',
- high='rtmp://<HOST>:1935/live/_definst_/tv2fyn_1000 live=1',
- medium='rtmp://<HOST>:1935/live/_definst_/tv2fyn_300 live=1'
-)
+TV2RChannel(100, CATEGORY_TV2_REG,
'rtmp://<HOST>:1935/live/_definst_/tv2fyn_2000 live=1')
# TV2 Lorry
-TV2RChannel(101, CATEGORY_TV2_REG).add_urls(
- best='rtmp://<HOST>:1935/live/_definst_/tv2lorry_2000 live=1',
- high='rtmp://<HOST>:1935/live/_definst_/tv2lorry_1000 live=1',
- medium='rtmp://<HOST>:1935/live/_definst_/tv2lorry_300 live=1'
-)
+TV2RChannel(101, CATEGORY_TV2_REG,
'rtmp://<HOST>:1935/live/_definst_/tv2lorry_2000 live=1')
# TV2 Syd
-TV2RChannel(102, CATEGORY_TV2_REG).add_urls(
- best='rtmp://<HOST>:1935/live/_definst_/tvsyd_2000 live=1',
- high='rtmp://<HOST>:1935/live/_definst_/tvsyd_1000 live=1',
- medium='rtmp://<HOST>:1935/live/_definst_/tvsyd_300 live=1'
-)
+TV2RChannel(102, CATEGORY_TV2_REG,
'rtmp://<HOST>:1935/live/_definst_/tvsyd_2000 live=1')
# TV2 Midtvest
-Channel(103, CATEGORY_TV2_REG).add_urls(
- high='rtmp://live.tvmidtvest.dk/tvmv/live live=1')
+Channel(103, CATEGORY_TV2_REG, 'rtmp://live.tvmidtvest.dk/tvmv/live live=1')
# TV2 Nord
-TV2RChannel(105, CATEGORY_TV2_REG).add_urls(
- best='rtmp://<HOST>:1935/live/_definst_/tv2nord-plus_2000 live=1',
- high='rtmp://<HOST>:1935/live/_definst_/tv2nord-plus_1000 live=1',
- medium='rtmp://<HOST>:1935/live/_definst_/tv2nord-plus_300 live=1'
-)
+TV2RChannel(105, CATEGORY_TV2_REG,
'rtmp://<HOST>:1935/live/_definst_/tv2nord-plus_2000 live=1')
# TV2 East
-Channel(106, CATEGORY_TV2_REG).add_urls(
-
best='http://tv2east.live-s.cdn.bitgravity.com/cdn-live-c1/_definst_/tv2east/live/feed01/playlist.m3u8'
-)
+Channel(106, CATEGORY_TV2_REG,
'http://tv2east.live-s.cdn.bitgravity.com/cdn-live-c1/_definst_/tv2east/live/feed01/playlist.m3u8')
# TV2 OJ
-TV2RChannel(108, CATEGORY_TV2_REG).add_urls(
- best='rtmp://<HOST>:1935/live/_definst_/tv2oj-plus_2000 live=1',
- high='rtmp://<HOST>:1935/live/_definst_/tv2oj_plus_1000 live=1',
- medium='rtmp://<HOST>:1935/live/_definst_/tv2oj_plus_300 live=1'
-)
+TV2RChannel(108, CATEGORY_TV2_REG,
'rtmp://<HOST>:1935/live/_definst_/tv2oj-plus_2000 live=1')
# TV2 Bornholm
-Channel(109, CATEGORY_TV2_REG).add_urls(
- best='rtmp://itv08.digizuite.dk/tv2b/ch1 live=1'
-)
+Channel(109, CATEGORY_TV2_REG, 'rtmp://itv08.digizuite.dk/tv2b/ch1 live=1')
#
http://ft.arkena.tv/xml/core_player_clip_data_v2_REAL.php?wtve=187&wtvl=2&wtvk=012536940751284&as=1
# Folketinget
-Channel(201, CATEGORY_MISC).add_urls(
- best='rtmp://ftflash.arkena.dk/webtvftlivefl/ playpath=mp4:live.mp4
pageUrl=http://www.ft.dk/webTV/TV_kanalen_folketinget.aspx live=1'
-)
+Channel(201, CATEGORY_MISC, 'rtmp://ftflash.arkena.dk/webtvftlivefl/
playpath=mp4:live.mp4
pageUrl=http://www.ft.dk/webTV/TV_kanalen_folketinget.aspx live=1')
# kanalsport.dk
-Channel(203, CATEGORY_MISC).add_urls(
-
best='http://lswb-de-08.servers.octoshape.net:1935/live/kanalsport_1000k/playlist.m3u8'
-)
+Channel(203, CATEGORY_MISC,
'http://lswb-de-08.servers.octoshape.net:1935/live/kanalsport_1000k/playlist.m3u8')
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 eafc0a8..e73e7aa 100644
--- a/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
@@ -1,22 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30100">Generelt</string>
- <string id="30101">Kvalitet</string>
<string id="30102">Grupper kanalerne</string>
- <string id="30103">DRs kanaler</string>
- <string id="30104">Har du problemer med at afspille en af DRs
kanaler,</string>
- <string id="30105">så prøv at skifte til den sekundære stream eller
omvendt.</string>
- <string id="30106">Primær stream</string>
- <string id="30107">Sekundær stream</string>
<string id="30108">Advarsler</string>
<string id="30109">Advar hvis ikke i Danmark</string>
- <string id="30150">Bedste (op til 2 mbit/s)</string>
- <string id="30151">Høj (1 mbit/s)</string>
- <string id="30152">Medium (500 kbit/s)</string>
- <string id="30153">Lav (250 kbit/s)</string>
- <string id="30153">AkamaiHD-stream (Raspberry Pi/AppleTV
kompatibel)</string>
-
<string id="30201">Danmarks Radio</string>
<string id="30202">TV2/Regionerne</string>
<string id="30203">Blandet</string>
@@ -37,9 +25,7 @@
<string id="30608">TV 2 | ÃSTJYLLAND</string>
<string id="30609">TV 2/Bornholm</string>
- <string id="30700">24 Nordjyske</string>
<string id="30701">Folketinget TV</string>
- <string id="30702">danskespil.dk Lotto</string>
<string id="30703">Kanal Sport</string>
<string id="30970">Advarsel!</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 89021db..9990ae8 100644
--- a/plugin.video.dr.dk.live/resources/language/English/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/English/strings.xml
@@ -1,22 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30100">General</string>
- <string id="30101">Quality</string>
<string id="30102">Group channels</string>
- <string id="30103">DRs channels</string>
- <string id="30104">If you have problems with watching some of DRs
channels,</string>
- <string id="30105">then try switching to the secondary stream or
vice-versa.</string>
- <string id="30106">Primær stream</string>
- <string id="30107">Sekundær stream</string>
<string id="30108">Warnings</string>
<string id="30109">Warn when not in Denmark</string>
- <string id="30150">Best (up to 2 mbit/s)</string>
- <string id="30151">High (1 mbit/s)</string>
- <string id="30152">Medium (500 kbit/s)</string>
- <string id="30153">Low (250 kibt/s)</string>
- <string id="30154">AkamaiHD-stream (Raspberry Pi/AppleTV
compatible)</string>
-
<string id="30201">Danish Broadcasting Corporation</string>
<string id="30202">TV2/Regions</string>
<string id="30203">Miscellaneous</string>
@@ -37,9 +25,7 @@
<string id="30608">TV 2 | ÃSTJYLLAND</string>
<string id="30609">TV 2/Bornholm</string>
- <string id="30700">24 Nordjyske</string>
<string id="30701">Folketinget TV</string>
- <string id="30702">danskespil.dk Lotto</string>
<string id="30703">Kanal Sport</string>
<string id="30970">Warning!</string>
diff --git a/plugin.video.dr.dk.live/resources/settings.xml
b/plugin.video.dr.dk.live/resources/settings.xml
index 8f91db9..1a68bce 100644
--- a/plugin.video.dr.dk.live/resources/settings.xml
+++ b/plugin.video.dr.dk.live/resources/settings.xml
@@ -1,19 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<settings>
<category label="30100">
- <setting id="quality" label="30101" type="enum"
lvalues="30150|30151|30152|30153|30154" />
<setting id="group.by.category" label="30102" type="bool"
default="false" />
</category>
- <category label="30103">
- <setting type="lsep" label="30104" />
- <setting type="lsep" label="30105" />
- <setting id="dr1.stream" label="30501" type="enum" default="0"
lvalues="30106|30107" />
- <setting id="dr2.stream" label="30502" type="enum" default="0"
lvalues="30106|30107" />
- <setting id="dr3.stream" label="30506" type="enum" default="0"
lvalues="30106|30107" />
- <setting id="drultra.stream" label="30503" type="enum" default="0"
lvalues="30106|30107" />
- <setting id="drk.stream" label="30504" type="enum" default="0"
lvalues="30106|30107" />
- <setting id="drramasjang.stream" label="30505" type="enum" default="0"
lvalues="30106|30107" />
- </category>
<category label="30108">
<setting id="warn.if.not.in.denmark" label="30109" type="bool"
default="true" />
</category>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.dr.dk.live/addon.py | 96 +++-------
plugin.video.dr.dk.live/addon.xml | 2 +-
plugin.video.dr.dk.live/changelog.txt | 6 +
plugin.video.dr.dk.live/channels.py | 181 ++++----------------
.../resources/language/Danish/strings.xml | 14 --
.../resources/language/English/strings.xml | 14 --
plugin.video.dr.dk.live/resources/settings.xml | 11 --
7 files changed, 73 insertions(+), 251 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
