The branch, dharma has been updated
via f2e7ce766b2a141d9eabbf5b3460d9790b6b3ac2 (commit)
from e0fffa276421921ec369d944fa5fe81a4e3e9ba3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f2e7ce766b2a141d9eabbf5b3460d9790b6b3ac2
commit f2e7ce766b2a141d9eabbf5b3460d9790b6b3ac2
Author: spiff <[email protected]>
Date: Wed Apr 6 19:25:50 2011 +0200
[plugin.audio.dr.dk.netradio] updated to version 1.0.3
diff --git a/plugin.audio.dr.dk.netradio/addon.py
b/plugin.audio.dr.dk.netradio/addon.py
index cd87bb0..f18295e 100644
--- a/plugin.audio.dr.dk.netradio/addon.py
+++ b/plugin.audio.dr.dk.netradio/addon.py
@@ -10,39 +10,6 @@ import danishaddons.web
BASE_URL = 'http://www.dr.dk/netradio/wmp.asp'
-RTMP_URL = 'rtmp://live.gss.dr.dk/live/'
-CHANNELS = \
- ('DR P1', 'Channel3_HQ'),\
- ('DR P2', 'Channel4_HQ'),\
- ('DR P3', 'Channel5_HQ'),\
- ('DR P4 København', 'Channel8_HQ'),\
- ('DR P4 Sjælland', 'Channel11_HQ'),\
- ('DR P4 Ãstjylland', 'Channel14_HQ'),\
- ('DR P4 Syd', 'Channel12_HQ'),\
- ('DR P4 Fyn', 'Channel7_HQ'),\
- ('DR P4 Nordjylland', 'Channel10_HQ'),\
- ('DR P4 Midt & Vest', 'Channel9_HQ'),\
- ('DR P4 Trekanten', 'Channel13_HQ'),\
- ('DR P4 Bornholm', 'Channel6_HQ'),\
- ('DR P4 Esbjerg', 'Channel15_HQ'),\
- ('DR P4 NordvestSjælland', 'Channel16_HQ'),\
- ('DR P5', 'Channel16_HQ'),\
- ('DR Barometer', 'Channel17_HQ'),\
- ('DR Hit', 'Channel21_HQ'),\
- ('DR Soft', 'Channel28_HQ'),\
- ('DR Boogieradio', 'Channel18_HQ'),\
- ('DR Jazz', 'Channel22_HQ'),\
- ('DR Oline', 'Channel24_HQ'),\
- ('DR Dansktop', 'Channel19_HQ'),\
- ('DR Rock', 'Channel27_HQ'),\
- ('DR Unga Bunga', 'Channel29_HQ'),\
- ('DR Evergreen', 'Channel20_HQ'),\
- ('DR P5000', 'Channel2_HQ'),\
- ('DR Klassisk', 'Channel23_HQ'),\
- ('DR R&B', 'Channel26_HQ'),\
- ('DR World', 'Channel30_HQ'),\
- ('DR Nyheder', 'Channel1_HQ')
-
def showChannels():
icon = os.path.join(danishaddons.ADDON_PATH, 'icon.png')
@@ -62,9 +29,9 @@ def showChannels():
url = danishaddons.ADDON_PATH + '?url=' + asxUrl
xbmcplugin.addDirectoryItem(danishaddons.ADDON_HANDLE, url, item)
else: # format == 'AAC'
- for c in CHANNELS:
- name = c[0]
- url = RTMP_URL + c[1]
+ for idx in range(1, 31):
+ name = danishaddons.msg(30100 + idx)
+ url = danishaddons.msg(30200 + idx)
item = xbmcgui.ListItem(name, iconImage = icon)
item.setProperty('IsPlayable', 'true')
item.setProperty("IsLive", "true")
diff --git a/plugin.audio.dr.dk.netradio/addon.xml
b/plugin.audio.dr.dk.netradio/addon.xml
index b8e435a..9e1ecd0 100644
--- a/plugin.audio.dr.dk.netradio/addon.xml
+++ b/plugin.audio.dr.dk.netradio/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.audio.dr.dk.netradio"
- version="1.0.2"
+ version="1.0.3"
name="DR.dk Netradio"
provider-name="stemann [[email protected]], twinther [[email protected]]">
<requires>
diff --git a/plugin.audio.dr.dk.netradio/changelog.txt
b/plugin.audio.dr.dk.netradio/changelog.txt
index c4dc7a2..fd884b2 100644
--- a/plugin.audio.dr.dk.netradio/changelog.txt
+++ b/plugin.audio.dr.dk.netradio/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 1.0.3[/B]
+- Fix encoding error with danish chars in .py file
+
[B]Version 1.0.2[/B]
- Prepare for official repository
diff --git a/plugin.audio.dr.dk.netradio/resources/language/English/strings.xml
b/plugin.audio.dr.dk.netradio/resources/language/English/strings.xml
index d15781b..414862f 100644
--- a/plugin.audio.dr.dk.netradio/resources/language/English/strings.xml
+++ b/plugin.audio.dr.dk.netradio/resources/language/English/strings.xml
@@ -3,4 +3,67 @@
<string id="30000">General</string>
<string id="30001">Format</string>
<string id="30002">Quality</string>
+
+ <!-- AAC channels -->
+ <string id="30101">DR P1</string>
+ <string id="30201">rtmp://live.gss.dr.dk/live/Channel3_HQ</string>
+ <string id="30102">DR P2</string>
+ <string id="30202">rtmp://live.gss.dr.dk/live/Channel4_HQ</string>
+ <string id="30103">DR P3</string>
+ <string id="30203">rtmp://live.gss.dr.dk/live/Channel5_HQ</string>
+ <string id="30104">DR P4 København</string>
+ <string id="30204">rtmp://live.gss.dr.dk/live/Channel8_HQ</string>
+ <string id="30105">DR P4 Sjælland</string>
+ <string id="30205">rtmp://live.gss.dr.dk/live/Channel11_HQ</string>
+ <string id="30106">DR P4 Ãstjylland</string>
+ <string id="30206">rtmp://live.gss.dr.dk/live/Channel14_HQ</string>
+ <string id="30107">DR P4 Syd</string>
+ <string id="30207">rtmp://live.gss.dr.dk/live/Channel12_HQ</string>
+ <string id="30108">DR P4 Fyn</string>
+ <string id="30208">rtmp://live.gss.dr.dk/live/Channel7_HQ</string>
+ <string id="30109">DR P4 Nordjylland</string>
+ <string id="30209">rtmp://live.gss.dr.dk/live/Channel10_HQ</string>
+ <string id="30110">DR P4 Midt & Vest</string>
+ <string id="30210">rtmp://live.gss.dr.dk/live/Channel9_HQ</string>
+ <string id="30111">DR P4 Trekanten</string>
+ <string id="30211">rtmp://live.gss.dr.dk/live/Channel13_HQ</string>
+ <string id="30112">DR P4 Bornholm</string>
+ <string id="30212">rtmp://live.gss.dr.dk/live/Channel6_HQ</string>
+ <string id="30113">DR P4 Esbjerg</string>
+ <string id="30213">rtmp://live.gss.dr.dk/live/Channel15_HQ</string>
+ <string id="30114">DR P4 NordvestSjælland</string>
+ <string id="30214">rtmp://live.gss.dr.dk/live/Channel16_HQ</string>
+ <string id="30115">DR P5</string>
+ <string id="30215">rtmp://live.gss.dr.dk/live/Channel16_HQ</string>
+ <string id="30116">DR Barometer</string>
+ <string id="30216">rtmp://live.gss.dr.dk/live/Channel17_HQ</string>
+ <string id="30117">DR Hit</string>
+ <string id="30217">rtmp://live.gss.dr.dk/live/Channel21_HQ</string>
+ <string id="30118">DR Soft</string>
+ <string id="30218">rtmp://live.gss.dr.dk/live/Channel28_HQ</string>
+ <string id="30119">DR Boogieradio</string>
+ <string id="30219">rtmp://live.gss.dr.dk/live/Channel18_HQ</string>
+ <string id="30120">DR Jazz</string>
+ <string id="30220">rtmp://live.gss.dr.dk/live/Channel22_HQ</string>
+ <string id="30121">DR Oline</string>
+ <string id="30221">rtmp://live.gss.dr.dk/live/Channel24_HQ</string>
+ <string id="30122">DR Dansktop</string>
+ <string id="30222">rtmp://live.gss.dr.dk/live/Channel19_HQ</string>
+ <string id="30123">DR Rock</string>
+ <string id="30223">rtmp://live.gss.dr.dk/live/Channel27_HQ</string>
+ <string id="30124">DR Unga Bunga</string>
+ <string id="30224">rtmp://live.gss.dr.dk/live/Channel29_HQ</string>
+ <string id="30125">DR Evergreen</string>
+ <string id="30225">rtmp://live.gss.dr.dk/live/Channel20_HQ</string>
+ <string id="30126">DR P5000</string>
+ <string id="30226">rtmp://live.gss.dr.dk/live/Channel2_HQ</string>
+ <string id="30127">DR Klassisk</string>
+ <string id="30227">rtmp://live.gss.dr.dk/live/Channel23_HQ</string>
+ <string id="30128">DR R&B</string>
+ <string id="30228">rtmp://live.gss.dr.dk/live/Channel26_HQ</string>
+ <string id="30129">DR World</string>
+ <string id="30229">rtmp://live.gss.dr.dk/live/Channel30_HQ</string>
+ <string id="30130">DR Nyheder</string>
+ <string id="30230">rtmp://live.gss.dr.dk/live/Channel1_HQ</string>
+
</strings>
diff --git a/plugin.audio.dr.dk.netradio/test.py
b/plugin.audio.dr.dk.netradio/test.py
index 654a856..e561f8f 100644
--- a/plugin.audio.dr.dk.netradio/test.py
+++ b/plugin.audio.dr.dk.netradio/test.py
@@ -14,10 +14,11 @@ import addon
class TestDrDkNetradio(unittest.TestCase):
def setUp(self):
- danishaddons.init([os.getcwd(), '12345', ''])
+ danishaddons.init(['.', '12345', ''])
xbmcplugin.items = list()
def testShowChannelsHighQuality(self):
+ xbmcaddon.settings['format'] = 'WMA'
xbmcaddon.settings['quality'] = 'High'
addon.showChannels()
self.assertNotEquals(0, len(xbmcplugin.items), msg = 'Expected at
least one ListItem')
@@ -28,6 +29,7 @@ class TestDrDkNetradio(unittest.TestCase):
self.assertNotEqual(-1, xbmcplugin.items[0].url.find('_128.asx'))
def testShowChannelsMediumQuality(self):
+ xbmcaddon.settings['format'] = 'WMA'
xbmcaddon.settings['quality'] = 'Medium'
addon.showChannels()
self.assertNotEquals(0, len(xbmcplugin.items), msg = 'Expected at
least one ListItem')
@@ -38,6 +40,7 @@ class TestDrDkNetradio(unittest.TestCase):
self.assertNotEqual(-1, xbmcplugin.items[0].url.find('_64.asx'))
def testShowChannelsLowQuality(self):
+ xbmcaddon.settings['format'] = 'WMA'
xbmcaddon.settings['quality'] = 'Low'
addon.showChannels()
self.assertNotEquals(0, len(xbmcplugin.items), msg = 'Expected at
least one ListItem')
@@ -48,6 +51,7 @@ class TestDrDkNetradio(unittest.TestCase):
self.assertNotEqual(-1, xbmcplugin.items[0].url.find('_32.asx'))
def testPlayFirstStream(self):
+ xbmcaddon.settings['format'] = 'WMA'
xbmcaddon.settings['quality'] = 'High'
addon.showChannels()
@@ -62,4 +66,4 @@ class TestDrDkNetradio(unittest.TestCase):
if __name__ == '__main__':
unittest.main()
-
\ No newline at end of file
+
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.dr.dk.netradio/addon.py | 39 +-----------
plugin.audio.dr.dk.netradio/addon.xml | 2 +-
plugin.audio.dr.dk.netradio/changelog.txt | 3 +
.../resources/language/English/strings.xml | 63 ++++++++++++++++++++
plugin.audio.dr.dk.netradio/test.py | 8 ++-
5 files changed, 76 insertions(+), 39 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
