The branch, eden has been updated
       via  d97ec388463827a4259415deb311cf9c9938f077 (commit)
       via  51ccedbdceb4abd8da3cb7182a6a348533fa42be (commit)
      from  651b95039fb3bc5e24dbffc7eb62708866e18c69 (commit)

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

commit d97ec388463827a4259415deb311cf9c9938f077
Author: spiff <[email protected]>
Date:   Fri Apr 13 18:59:12 2012 +0200

    [plugin.video.tv3play.dk] updated to version 1.0.1

diff --git a/plugin.video.tv3play.dk/addon.py b/plugin.video.tv3play.dk/addon.py
index 70ff4fd..acb8dbe 100644
--- a/plugin.video.tv3play.dk/addon.py
+++ b/plugin.video.tv3play.dk/addon.py
@@ -39,6 +39,9 @@ class TV3PlayException(Exception):
 class TV3PlayAddon(object):
     def listPrograms(self):
         html = self.downloadUrl(self.getBaseUrl() + '/program')
+        if not html:
+            raise TV3PlayException(ADDON.getLocalizedString(204))
+
         items = list()
         for m in re.finditer('<a href="/program/([^"]+)">([^<]+)</a>', html):
             slug = m.group(1)
@@ -46,8 +49,6 @@ class TV3PlayAddon(object):
             fanart = self.downloadAndCacheFanart(slug, None)
 
             item = xbmcgui.ListItem(title, iconImage=ICON)
-            if not fanart:
-                fanart = FANART
             item.setIconImage(fanart)
             item.setProperty('Fanart_Image', fanart)
             items.append((PATH + '?program=%s' % slug, item, True))
@@ -57,9 +58,14 @@ class TV3PlayAddon(object):
 
     def listSeasons(self, slug):
         html = self.downloadUrl(self.getBaseUrl() + '/program/%s' % slug)
+        if not html:
+            raise TV3PlayException(ADDON.getLocalizedString(203))
+
         fanart = self.downloadAndCacheFanart(slug, html)
 
         m = re.search('Table body(.*?)</tbody>.*?Table body(.*?)</tbody>', 
html, re.DOTALL)
+        if not m:
+            raise TV3PlayException(ADDON.getLocalizedString(203))
         episodesHtml = m.group(1)
         clipsHtml = m.group(2)
 
@@ -82,8 +88,6 @@ class TV3PlayAddon(object):
             videoCount = seasonHtml.count('href="/play/')
             if videoCount > 0:
                 item = xbmcgui.ListItem('%s (%s)' % (season.decode('utf8', 
'ignore'), ADDON.getLocalizedString(103)), iconImage = ICON)
-                if not fanart:
-                    fanart = FANART
                 item.setIconImage(fanart)
                 item.setProperty('Fanart_Image', fanart)
                 xbmcplugin.addDirectoryItem(HANDLE, PATH + 
'?program=%s&season=%s&clips=true' % (slug, season), item, True, videoCount)
@@ -133,8 +137,6 @@ class TV3PlayAddon(object):
             item = xbmcgui.ListItem(title, iconImage = ICON)
             item.setInfo('video', infoLabels)
             item.setProperty('IsPlayable', 'true')
-            if not fanart:
-                fanart = FANART
             item.setIconImage(fanart)
             item.setProperty('Fanart_Image', fanart)
             items.append((PATH + '?playVideo=%s' % videoId, item))
@@ -148,26 +150,33 @@ class TV3PlayAddon(object):
 
     def playVideo(self, videoId):
         doc = self.getPlayProductXml(videoId)
-        rtmpUrl = self.getRtmpUrl(doc.findtext('Product/Videos/Video/Url')) + 
' swfUrl=http://flvplayer.viastream.viasat.tv/play/swf/player111227.swf 
swfVfy=true'
+        url = doc.findtext('Product/Videos/Video/Url')
+        if not url:
+            raise TV3PlayException(ADDON.getLocalizedString(202))
+        rtmpUrl = self.getRtmpUrl(url) + ' 
swfUrl=http://flvplayer.viastream.viasat.tv/play/swf/player111227.swf 
swfVfy=true'
 
         playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
         playlist.clear()
 
         # Preroll
-        url = doc.find('Product/AdCalls/preroll').get('url')
-        node = self.getXml(url).find('Ad')
-        if node is not None:
-            flvUrl = 
node.findtext('InLine/Creatives/Creative/Linear/MediaFiles/MediaFile')
-            item = xbmcgui.ListItem(ADDON.getLocalizedString(100), iconImage = 
ICON)
-            playlist.add(flvUrl, item)
+        prerollNode = doc.find('Product/AdCalls/preroll')
+        if prerollNode is not None:
+            url = prerollNode.get('url')
+            node = self.getXml(url).find('Ad')
+            if node is not None:
+                flvUrl = 
node.findtext('InLine/Creatives/Creative/Linear/MediaFiles/MediaFile')
+                item = xbmcgui.ListItem(ADDON.getLocalizedString(100), 
iconImage = ICON)
+                playlist.add(flvUrl, item)
 
-        adNodes = None
         start = 0
         for idx, node in enumerate(doc.findall('Product/AdCalls/midroll')):
-            if adNodes is None:
-                adXml = self.downloadUrl(node.get('url'))
-                adDoc = ElementTree.fromstring(adXml.decode('utf8', 'ignore'))
-                adNodes = adDoc.findall('Ad')
+            adXml = self.downloadUrl(node.get('url'))
+            if not adXml:
+                continue
+            adDoc = ElementTree.fromstring(adXml.decode('utf8', 'ignore'))
+            adUrl = 
adDoc.findtext('Ad/InLine/Creatives/Creative/Linear/MediaFiles/MediaFile')
+            if not adUrl:
+                continue
 
             stop = int(node.get('time'))
             itemUrl = rtmpUrl + ' start=%d stop=%d' % (start * 1000, stop * 
1000)
@@ -175,21 +184,22 @@ class TV3PlayAddon(object):
             playlist.add(itemUrl, featureItem)
             start = stop
 
-            if len(adNodes) > idx:
-                item = xbmcgui.ListItem(ADDON.getLocalizedString(100), 
iconImage = ICON)
-                
playlist.add(adNodes[idx].findtext('InLine/Creatives/Creative/Linear/MediaFiles/MediaFile'),
 item)
+            item = xbmcgui.ListItem(ADDON.getLocalizedString(100), iconImage = 
ICON)
+            playlist.add(adUrl, item)
 
         itemUrl = rtmpUrl + ' start=%d' % (start * 1000)
         featureItem = xbmcgui.ListItem(doc.findtext('Product/Title'), 
thumbnailImage=doc.findtext('Product/Images/ImageMedia/Url'), path = itemUrl)
         playlist.add(itemUrl, featureItem)
 
         # Postroll
-        url = doc.find('Product/AdCalls/postroll').get('url')
-        node = self.getXml(url).find('Ad')
-        if node is not None:
-            flvUrl = 
node.findtext('InLine/Creatives/Creative/Linear/MediaFiles/MediaFile')
-            item = xbmcgui.ListItem(ADDON.getLocalizedString(100), iconImage = 
ICON)
-            playlist.add(flvUrl, item)
+        postrollNode = doc.find('Product/AdCalls/postroll')
+        if postrollNode is not None:
+            url = postrollNode.get('url')
+            node = self.getXml(url).find('Ad')
+            if node is not None:
+                flvUrl = 
node.findtext('InLine/Creatives/Creative/Linear/MediaFiles/MediaFile')
+                item = xbmcgui.ListItem(ADDON.getLocalizedString(100), 
iconImage = ICON)
+                playlist.add(flvUrl, item)
 
         xbmcplugin.setResolvedUrl(HANDLE, True, playlist[0])
 
@@ -203,6 +213,8 @@ class TV3PlayAddon(object):
             return videoUrl.replace(' ', '%20')
 
         xml = self.downloadUrl(videoUrl)
+        if not xml:
+            raise TV3PlayException(ADDON.getLocalizedString(202))
         doc = ElementTree.fromstring(xml)
 
         if doc.findtext('Success') == 'true':
@@ -212,12 +224,17 @@ class TV3PlayAddon(object):
 
     def getXml(self, url):
         xml = self.downloadUrl(url)
-        return ElementTree.fromstring(xml.decode('utf8', 'ignore'))
+        if xml:
+            return ElementTree.fromstring(xml.decode('utf8', 'ignore'))
+        else:
+            return None
 
     def downloadAndCacheFanart(self, slug, html):
         fanartPath = os.path.join(CACHE_PATH, '%s.jpg' % 
slug.encode('iso-8859-1', 'replace'))
         if not os.path.exists(fanartPath) and html:
             m = re.search('/play/([0-9]+)/', html)
+            if not m:
+                return FANART
             xml = self.getPlayProductXml(m.group(1))
 
             fanartUrl = None
@@ -238,7 +255,7 @@ class TV3PlayAddon(object):
         elif os.path.exists(fanartPath):
             return fanartPath
 
-        return None
+        return FANART
 
     def getBaseUrl(self):
         if ADDON.getSetting('region.url') == '':
@@ -256,8 +273,6 @@ class TV3PlayAddon(object):
                 contents = u.read()
                 u.close()
                 return contents
-            except urllib2.URLError:
-                return None
             except Exception, ex:
                 if retries > 5:
                     raise TV3PlayException(ex)
@@ -283,6 +298,7 @@ if __name__ == '__main__':
         os.makedirs(CACHE_PATH)
 
     buggalo.SUBMIT_URL = 'http://tommy.winther.nu/exception/submit.php'
+    buggalo.addExtraData('region', ADDON.getSetting('region.url'))
     tv3PlayAddon = TV3PlayAddon()
     try:
         if PARAMS.has_key('playVideo'):
diff --git a/plugin.video.tv3play.dk/addon.xml 
b/plugin.video.tv3play.dk/addon.xml
index c4ae081..a64c005 100644
--- a/plugin.video.tv3play.dk/addon.xml
+++ b/plugin.video.tv3play.dk/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.tv3play.dk" version="1.0.0" name="TV3 Play" 
provider-name="twinther [[email protected]]">
+<addon id="plugin.video.tv3play.dk" version="1.0.1" name="TV3 Play" 
provider-name="twinther [[email protected]]">
     <requires>
         <import addon="xbmc.python" version="2.0"/>
         <import addon="script.module.buggalo" version="1.0.1"/>
diff --git a/plugin.video.tv3play.dk/changelog.txt 
b/plugin.video.tv3play.dk/changelog.txt
index 7528ed7..0f76e83 100644
--- a/plugin.video.tv3play.dk/changelog.txt
+++ b/plugin.video.tv3play.dk/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 1.0.1 - 2012-04-10[/B]
+- Better error handling for exceptional cases
+
 [B]Version 1.0.0 - 2012-04-02[/B]
 - Cleanup for first repo release
 - Added fanart
diff --git a/plugin.video.tv3play.dk/resources/language/Danish/strings.xml 
b/plugin.video.tv3play.dk/resources/language/Danish/strings.xml
index 98e1f13..71088a6 100644
--- a/plugin.video.tv3play.dk/resources/language/Danish/strings.xml
+++ b/plugin.video.tv3play.dk/resources/language/Danish/strings.xml
@@ -9,4 +9,7 @@
 
     <string id="200">Der er sket en fejl i kommunikationen med TV3 
Play.</string>
     <string id="201">Fejlbeskeden er:</string>
+    <string id="202">Afspilnings-URL'en blev ikke fundet</string>
+    <string id="203">Ingen sæsoner fundet</string>
+    <string id="204">Programlisten kunne ikke indlæses</string>
 </strings>
diff --git a/plugin.video.tv3play.dk/resources/language/English/strings.xml 
b/plugin.video.tv3play.dk/resources/language/English/strings.xml
index d7921cc..592386d 100644
--- a/plugin.video.tv3play.dk/resources/language/English/strings.xml
+++ b/plugin.video.tv3play.dk/resources/language/English/strings.xml
@@ -7,6 +7,9 @@
 
     <string id="150">Choose region</string>
 
-    <string id="200">There was an error while communication with TV3 
Play.</string>
+    <string id="200">An error occurred while communication with TV3 
Play.</string>
     <string id="201">The error message is:</string>
+    <string id="202">Unable to find the playback URL</string>
+    <string id="203">No seasons available</string>
+    <string id="204">Unable to retrieve list of programs</string>
 </strings>

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=51ccedbdceb4abd8da3cb7182a6a348533fa42be

commit 51ccedbdceb4abd8da3cb7182a6a348533fa42be
Author: spiff <[email protected]>
Date:   Fri Apr 13 18:58:39 2012 +0200

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

diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index a74488a..dc7dbb0 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -88,10 +88,12 @@ class DanishLiveTV(object):
 
         for channel in CHANNELS:
             if str(channel.get_id()) == id:
-                try:
-                    idx = int(ADDON.getSetting(channel.get_config_key()))
-                except ValueError:
-                    idx = 0 # fallback for missing settings
+                idx = None
+                if 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:
@@ -138,6 +140,7 @@ if __name__ == '__main__':
     FANART = os.path.join(ADDON.getAddonInfo('path'), 'fanart.jpg')
     ICON = os.path.join(ADDON.getAddonInfo('path'), 'icon.png')
 
+    buggalo.SUBMIT_URL = 'http://tommy.winther.nu/exception/submit.php'
     try:
         danishTV = DanishLiveTV()
         if PARAMS.has_key('playChannel'):
diff --git a/plugin.video.dr.dk.live/addon.xml 
b/plugin.video.dr.dk.live/addon.xml
index 39e72c2..fddd510 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
-       id="plugin.video.dr.dk.live" version="2.1.2" name="Danish Live TV" 
provider-name="twinther [[email protected]]">
+       id="plugin.video.dr.dk.live" version="2.1.4" name="Danish Live TV" 
provider-name="twinther [[email protected]]">
        <requires>
                <import addon="xbmc.python" version="2.0"/>
+        <import addon="script.module.buggalo" version="1.0.1"/>
        </requires>
        <extension point="xbmc.python.pluginsource" library="addon.py">
                <provides>video</provides>
diff --git a/plugin.video.dr.dk.live/changelog.txt 
b/plugin.video.dr.dk.live/changelog.txt
index 4ce1ef9..55c304a 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,8 +1,16 @@
-[B]Version 2.1.2 - 2011-02-05[/B]
+[B]Version 2.1.4 - 2012-04-12[/B]
+- Added Kanal Sport
+- Use script.module.buggalo for error reporting
+
+[B]Version 2.1.3 - 2012-03-16[/B]
+- Updated DR's streaming urls
+- Removed 24Nordjyske (they switched to Silverlight Smooth Streaming)
+
+[B]Version 2.1.2 - 2012-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]
+[B]Version 2.1.1 - 2012-01-30[/B]
 - Fixed DR HD high-quality stream
 - Added TV2/Bornholm and TV/MIDT-VEST
 
diff --git a/plugin.video.dr.dk.live/channels.py 
b/plugin.video.dr.dk.live/channels.py
index 540f032..fa26ba4 100644
--- a/plugin.video.dr.dk.live/channels.py
+++ b/plugin.video.dr.dk.live/channels.py
@@ -79,19 +79,19 @@ class Channel(object):
 # http://dr.dk/nu/embed/live?height=467&width=830
 # DR1
 Channel(1, CATEGORY_DR, "dr1.stream").add_urls(
-    high   = ['rtmp://rtmplive.dr.dk/live/livedr01astream3 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr01bstream3 live=1'],
-    medium = ['rtmp://rtmplive.dr.dk/live/livedr01astream2 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr01bstream2 live=1'],
-    low    = ['rtmp://rtmplive.dr.dk/live/livedr01astream1 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr01bstream1 live=1'])
+    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'])
 # DR2
 Channel(2, CATEGORY_DR, "dr2.stream").add_urls(
     high   = ['rtmp://rtmplive.dr.dk/live/livedr02astream3 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr02bstream3 live=1'],
     medium = ['rtmp://rtmplive.dr.dk/live/livedr02astream2 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr02bstream2 live=1'],
     low    = ['rtmp://rtmplive.dr.dk/live/livedr02astream1 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr02bstream1 live=1'])
 # DR Update
-Channel(3, CATEGORY_DR, "drupdate.stream").add_urls(
-    high   = ['rtmp://rtmplive.dr.dk/live/livedr03astream3 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr03bstream3 live=1'],
-    medium = ['rtmp://rtmplive.dr.dk/live/livedr03astream2 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr03bstream2 live=1'],
-    low    = ['rtmp://rtmplive.dr.dk/live/livedr03astream1 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr03bstream1 live=1'])
+Channel(3, CATEGORY_DR).add_urls(#, "drupdate.stream").add_urls(
+    high   = 'rtmp://livetv.gss.dr.dk/live/livedr03astream3 live=1',
+    medium = 'rtmp://livetv.gss.dr.dk/live/livedr03astream2 live=1',
+    low    = 'rtmp://livetv.gss.dr.dk/live/livedr03astream1 live=1')
 # DR K
 Channel(4, CATEGORY_DR, "drk.stream").add_urls(
     high   = ['rtmp://rtmplive.dr.dk/live/livedr04astream3 live=1', 
'rtmp://rtmplive.dr.dk/live/livedr04bstream3 live=1'],
@@ -105,8 +105,8 @@ Channel(5, CATEGORY_DR, "drramasjang.stream").add_urls(
 # DR HD
 Channel(6, CATEGORY_DR, "drhd.stream").add_urls(
     best   = ['rtmp://livetv.gss.dr.dk/live/livedr06astream3 live=1', 
'rtmp://livetv.gss.dr.dk/live/livedr06bstream3 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/livedr06astream1 live=1', 
'rtmp://livetv.gss.dr.dk/live/livedr06bstream1 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/livedr06astream1 live=1', 
'rtmp://livetv.gss.dr.dk/live/livedr06bstream1 live=1'])
 
 # TV2 Fyn
 Channel(100, CATEGORY_TV2_REG).add_urls(
@@ -145,15 +145,9 @@ Channel(106, CATEGORY_TV2_REG).add_urls(
 # )
 # TV2 Bornholm
 Channel(109, CATEGORY_TV2_REG).add_urls(
-    best   = 'mms://itv02.digizuite.dk/tv2b'
+    best   = 'rtsp://itv02.digizuite.dk/tv2b live=1'
 )
 
-# http://www.24nordjyske.dk/webtv_high.asp
-# 24 Nordjyske
-Channel(200, CATEGORY_MISC).add_urls(
-    high   = 'mms://stream.nordjyske.dk/24nordjyske - Full Broadcast Quality',
-    medium = 'mms://stream.nordjyske.dk/24nordjyske')
-
 # 
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(
@@ -162,3 +156,7 @@ Channel(201, CATEGORY_MISC).add_urls(
 Channel(202, CATEGORY_MISC).add_urls(
     best   = 'rtmp://lvs.wowza.jay.net/webstream/lotto live=1'
 )
+# kanalsport.dk
+Channel(203, CATEGORY_MISC).add_urls(
+    best   = 
'http://lswb-de-08.servers.octoshape.net:1935/live/kanalsport/500k/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 e4eb946..fbf4e52 100644
--- a/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/Danish/strings.xml
@@ -39,6 +39,7 @@
     <string id="31200">24 Nordjyske</string>
     <string id="31201">Folketinget TV</string>
     <string id="31202">danskespil.dk Lotto</string>
+    <string id="31203">Kanal Sport</string>
 
     <string id="99970">Advarsel!</string>
     <string id="99971">Det ser ud til du ikke befinder dig i Danmark.</string>
@@ -46,18 +47,4 @@
     <string id="99973">eller der kan opstå andre uventede fejl.</string>
     <string id="99974">OK</string>
     <string id="99975">Vis ikke igen</string>
-
-    <string id="99980">Game over, man! [I]Game over![/I]</string>
-    <string id="99981">You can't handle the truth!</string>
-    <string id="99982">Danger Will Robinson</string>
-    <string id="99983">Why does it cry, Sméagol?</string>
-    <string id="99984">Houston, we have a problem...</string>
-    <string id="99985">E.T. phone home</string>
-
-    <string id="99990">Der er desværre opstået en fejl i addon'en.</string>
-    <string id="99991">Du kan hjælpe med at løse fejlen ved at indsende 
en</string>
-    <string id="99992">fejlrapport. Der sendes ikke personlige 
oplysninger.</string>
-    <string id="99993">Indsend fejlrapport</string>
-    <string id="99994">Indsend ikke</string>
-    <string id="99995">Tak!</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 780b614..ff8f31f 100644
--- a/plugin.video.dr.dk.live/resources/language/English/strings.xml
+++ b/plugin.video.dr.dk.live/resources/language/English/strings.xml
@@ -39,6 +39,7 @@
     <string id="31200">24 Nordjyske</string>
     <string id="31201">Folketinget TV</string>
     <string id="31202">danskespil.dk Lotto</string>
+    <string id="31203">Kanal Sport</string>
 
     <string id="99970">Warning!</string>
     <string id="99971">It looks like you are not in Denmark.</string>
@@ -46,18 +47,4 @@
     <string id="99973">or other unexpected errors may occur.</string>
     <string id="99974">OK</string>
     <string id="99975">Don't show again</string>
-
-    <string id="99980">Game over, man! [I]Game over![/I]</string>
-    <string id="99981">You can't handle the truth!</string>
-    <string id="99982">Danger Will Robinson</string>
-    <string id="99983">Why does it cry, Sméagol?</string>
-    <string id="99984">Houston, we have a problem...</string>
-    <string id="99985">E.T. phone home</string>
-
-    <string id="99990">Unfortunately an error occurred in the addon.</string>
-    <string id="99991">You can help with fixing the problem by 
submitting</string>
-    <string id="99992">an error report. No personal information is 
sent.</string>
-    <string id="99993">Submit error report</string>
-    <string id="99994">Don't submit</string>
-    <string id="99995">Thank you!</string>
 </strings>
diff --git a/plugin.video.dr.dk.live/resources/settings.xml 
b/plugin.video.dr.dk.live/resources/settings.xml
index 6478d1b..b784af3 100644
--- a/plugin.video.dr.dk.live/resources/settings.xml
+++ b/plugin.video.dr.dk.live/resources/settings.xml
@@ -9,7 +9,7 @@
         <setting type="lsep" label="30105" />
         <setting id="dr1.stream" label="31001" type="enum" default="0" 
lvalues="30106|30107" />
         <setting id="dr2.stream" label="31002" type="enum" default="0" 
lvalues="30106|30107" />
-        <setting id="drupdate.stream" label="31003" type="enum" default="0" 
lvalues="30106|30107" />
+<!--        <setting id="drupdate.stream" label="31003" type="enum" 
default="0" lvalues="30106|30107" />-->
         <setting id="drk.stream" label="31004" type="enum" default="0" 
lvalues="30106|30107" />
         <setting id="drramasjang.stream" label="31005" type="enum" default="0" 
lvalues="30106|30107" />
         <setting id="drhd.stream" label="31006" type="enum" default="1" 
lvalues="30106|30107" />

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

Summary of changes:
 plugin.video.dr.dk.live/addon.py                   |   11 +-
 plugin.video.dr.dk.live/addon.xml                  |    3 +-
 plugin.video.dr.dk.live/buggalo.py                 |  117 --------------------
 plugin.video.dr.dk.live/changelog.txt              |   12 ++-
 plugin.video.dr.dk.live/channels.py                |   30 +++---
 .../resources/language/Danish/strings.xml          |   15 +---
 .../resources/language/English/strings.xml         |   15 +---
 plugin.video.dr.dk.live/resources/logos/200.png    |  Bin 50001 -> 0 bytes
 plugin.video.dr.dk.live/resources/logos/203.png    |  Bin 0 -> 47410 bytes
 plugin.video.dr.dk.live/resources/settings.xml     |    2 +-
 plugin.video.tv3play.dk/addon.py                   |   78 ++++++++-----
 plugin.video.tv3play.dk/addon.xml                  |    2 +-
 plugin.video.tv3play.dk/changelog.txt              |    3 +
 .../resources/language/Danish/strings.xml          |    3 +
 .../resources/language/English/strings.xml         |    5 +-
 15 files changed, 94 insertions(+), 202 deletions(-)
 delete mode 100644 plugin.video.dr.dk.live/buggalo.py
 delete mode 100644 plugin.video.dr.dk.live/resources/logos/200.png
 create mode 100644 plugin.video.dr.dk.live/resources/logos/203.png


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to