diff --git a/COPYING.txt b/COPYING.txt new file mode 100644 index 0000000..d72bc31 --- /dev/null +++ b/COPYING.txt @@ -0,0 +1,14 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, re/sub-license, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so. + +HE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/README b/README deleted file mode 100644 index 813dda3..0000000 --- a/README +++ /dev/null @@ -1,2 +0,0 @@ -Live streams for lots of news. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..a1ba2fa --- /dev/null +++ b/README.md @@ -0,0 +1,46 @@ +World News Live add-on for XBMC - This Addon is not supported anymore +========================================== + +This plugin provides streams of various news channels and allows you to watch them in XBMC. + +Some contents are geo-restricted. + +Installation +------------ +This latest stable release of this add-on is available as part of the +[k3oni repository] [repository1] and the [xbmcplus repository] [repository2]. + +For the latest development version, +you can grab the [GitHub generated ZIP file] [githubzip]. + +Simply download the ZIP file to your XBMC device and install through the menu +via System -> Settings -> Add-ons -> Install from zip file + +Issues +------ +For any issues or bug reports, please file them on the [issues page] [issues]. + +Please include log output if possible, using [Github Gist] [gist] or +[xbmclogs.com] [xbmclogs]. + +The location of your XBMC log file will depend on your platform, +see the [XBMC Wiki page] [xbmc-wiki-log-file] for information. + +Disclaimer +---------- +This script is released freely without restrictions, but also without +warrenty as described in the file "COPYING.txt" + +Credits +------- + - andrepl + Initial addon development. + +[repository1]: https://github.com/k3oni/repository.k3oni.xbmc/archive/master.zip +[repository2]: https://github.com/moneymaker365/repository.xbmcplus.xbmc-plugins/releases +[githubzip]: https://github.com/k3oni/plugin.video.world.news.live/archive/master.zip +[issues]: https://github.com/k3oni/plugin.video.world.news.live/ +[gist]: https://gist.github.com +[xbmclogs]: http://xbmclogs.com/ +[xbmc-wiki-log-file]: http://wiki.xbmc.org/index.php?title=Log_file/Advanced#Log_files + diff --git a/addon.xml b/addon.xml index b3dd07c..6d51793 100644 --- a/addon.xml +++ b/addon.xml @@ -1,25 +1,20 @@ - + - - - - + + + - + video - World News - Al-Jazeera Live Arabic/English, BBC, CNN, C-SPAN, and various new streams. all - + World News Channels + Al-Jazeera, BBC, CNN, C-SPAN, EuroNews, RT, SkyNews etc. + Some parts of this addon may not be legal in your country of residence - please check with your local laws before installing. + https://github.com/k3oni/plugin.video.world.news.live + http://forum.xbmc.org/showthread.php?tid=97488 + diff --git a/changelog.txt b/changelog.txt index 0c3b44e..2f964e5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,127 @@ +1.5.1.2 - Fix CBS class, BBC World stream + +1.5.1.1 - Fix Antena3 icon + +1.5.1 - Add The Weather Channel US + +1.5 - Fix common issues + +1.4.0.1 - Fix BBC World News + +1.4 - Fix RT, Sky News, NDTV, Arirang + +1.3.8.9 - Remove ProTV and UT, add Digi24, fix France 24 + +1.3.8.8 - Add CCTV back + +1.3.8.7 - Fix CNBC, add ProTV + +1.3.8.6 - Fix Aljazeera AR streams + +1.3.8.5 - Add UT and ABC 24 back + +1.3.8.4 - Fix CNN, PressTV, remove a couple non working streams + +1.3.8.3 - Rearrange BBC, add BBC Persian + +1.3.8.2 - Fix Euronews + +1.3.8.1 - Fix UAToday + +1.3.8 - Added Sky News HD. Fix UAToday, euronews + +1.3.7 - Fix BBC Arabic, Sky News, eNCA, UAToday logo. Added ABC News + +1.3.6.1 - Fix BBC World News + +1.3.6.0 - Fix Sky News + +1.3.5.9 - Fix Sky News + +1.3.5.8 - Add CNN Medium, remove BBC News for now + +1.3.5.7 - Add Ukraine Today + +1.3.5.6 - Fix BBC World News + +1.3.5.5 - Fix CNN International + +1.3.5.4 - Fix CNN International + +1.3.5.3 - Fix Sky News, remove BBC World News and CCTV, change Bloomberg to One channel only. + +1.3.5.2 - Fix Al Jazeera English, remove Al Jazeera US, remove Sky News International for now + +1.3.5.1 - Fixed Mhz, NHK + +1.3.5 - edit add-on.xml, added import modules + +1.3.4.4 - Fixed CNN, BBC World News. Added BBC News and Rai News24 + +1.3.4.3 - Fixed i24News + +1.3.4.2 - Fixed BBC News, RT, Reuters, France24, Sky News Arabia, Removed DVB + +1.3.4.1 - Changing size of the logos, cleaned up code, Added Sky News + +1.3.4 - Added Al Aan, Al Alam, Al Jazeera America, Al Mayadeen, Al Nabaa TV, BBC Arabic, Nasa TV () HD, VoA Persian, DVB, NDTV 24x7, tagesschau24 + +1.3.3.4 - Added 24 Vesti + +1.3.3.3 - Added The People’s Voice + +1.3.3.2 - Fixed BBC World News + +1.3.3.1 - Added NHK World, CCTV News, Arirang TV World, MHz Worldview + +1.3.3 - v13.x support, clean-up + +1.3.2.5 - Fixed BBC World News + +1.3.2.4 - Fixed BBC World News + +1.3.2.3 - Fixed eNCA, PressTV + +1.3.2.2 - Added Reuters, Channel NewsAsia International + +1.3.2.1 - Added Bloomberg U.S., Asia, Europe and Live Event + +1.3.2.0 - Fixed Bloomberg + +1.3.1.9 - Added i24news, Hided BBC News + +1.3.1.8 - Moved ABC News to folder list, added non restricted stream to list + +1.3.1.7 - Hided BigPond News; Changed to GeoRestricted ABC News 24 (Australia) + +1.3.1.6 - Fixed SkyNews International, CNN, BBC World News, Aljazeera (EN, AR) + +1.3.1.5 - Added eNCA, Deutsche Welle, + +1.3.1.4 - Added arabic language to France24, RT + +1.3.1.3 - Added BigPond News + +1.3.1.2 - Fixed Bloomberg, Euronews, PressTV + +1.3.1.1 - Fixed CNBC + +1.3.1 - Fixed France24 + +1.3.0.1 - Small change on the repo including WNL + +1.3.0 - Fixed couple of streams including Bloomberg, ABC News 24 etc + +1.2.9 - Couple small code changes + +1.2.8 - Fixed CNN streams + +1.2.7 - Fixed the Euronews stream and added a French one as well + +1.2.6 - Added BBC News. Modifications regarding the BBC channels list + +1.2.5 - Fixed a few streams. Added CNBC, PressTV, Bloomberg and Sky News. Small code changes. + 1.2.4 - Fixed Al-Jazeera streams 1.2.3 - Added AJ Arabic (thanks FirasAlShafei) diff --git a/channels.py b/channels.py index 88f1b96..1de2fc7 100644 --- a/channels.py +++ b/channels.py @@ -3,62 +3,172 @@ from channel import BaseChannel, ChannelException,ChannelMetaClass, STATUS_BAD, STATUS_GOOD, STATUS_UGLY from utils import * +############# +## Arirang ## +############# + +class Arirang(BaseChannel): + playable = True + short_name = 'arirang_world' + long_name = 'Arirang TV World' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://worldlive-ios.arirang.co.kr/arirang/arirangtvworldios.mp4.m3u8') + +############## +## Antena 3 ## +############## + +class Antena3(BaseChannel): + playable = True + short_name = 'antena3' + long_name = 'Antena 3' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://antena3-aos1-apple-live.adaptive.level3.net/apple/antena3/channel01/antena_3_hd_1548K_1280x720_main.m3u8') + +################## +## AlJazeera AR ## +################## + class AlJazeeraArabic(BaseChannel): playable = False short_name = 'aljazeera_ar' - long_name = 'Al-Jazeera Live (Arabic)' + long_name = 'Al Jazeera Arabic' default_action = 'list_streams' def action_list_streams(self): data = {} data.update(self.args) - data.update({'action': 'play_stream', 'Title': 'Very High Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_ar_veryhigh.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-arabic-arabic" swfVfy=true live=true'}) - self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'High Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_ar_high.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-arabic-arabic" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'High Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_ara_high swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Standard Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_ar_medium.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-arabic-arabic" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'Medium Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_ara_med swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Low Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_ar_low.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-arabic-arabic" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'Low Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_ara_low swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) + #data.update({'action': 'play_stream', 'Title': 'Mobile Quality', 'stream_url': 'http://hd3.lsops.net/live/aljazeer_ar_hls.smil/playlist.m3u8'}) + #self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() def action_play_stream(self): self.plugin.set_stream_url(self.args['stream_url']) +################## +## AlJazeera EN ## +################## class AlJazeeraEnglish(BaseChannel): playable = False - short_name = 'aljazeera' - long_name = 'Al-Jazeera Live (English)' + short_name = 'aljazeera_en' + long_name = 'Al Jazeera English' default_action = 'list_streams' def action_list_streams(self): data = {} data.update(self.args) - data.update({'action': 'play_stream', 'Title': 'Very High Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_en_veryhigh.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-english-english" swfVfy=true live=true'}) - self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'High Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_en_high.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-english-english" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'High Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_eng_high swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Standard Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_en_medium.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-english-english" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'Medium Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_eng_med swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Low Definition', 'stream_url': 'rtmp://media2.lsops.net/live playpath=aljazeer_en_low.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageURL="http://www.livestation.com/channels/3-al-jazeera-english-english" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'Low Quality', 'stream_url': 'rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/ playpath=aljazeera_eng_low swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) self.plugin.add_list_item(data, is_folder=False) + #data.update({'action': 'play_stream', 'Title': 'Mobile Quality', 'stream_url': 'http://hd2.lsops.net/live/aljazeer_en_hls.smil/playlist.m3u8'}) + #self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() def action_play_stream(self): self.plugin.set_stream_url(self.args['stream_url']) - + +############## +## ABC News ## +############## -class BBC(BaseChannel): +class ABCNEWS(BaseChannel): playable = True + short_name = 'abcnews' + long_name = 'ABC News' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://abclive.abcnews.com/i/abc_live4@136330/master.m3u8?b=500,300,700,900,1200') + +############### +## ABCNews24 ## +############### + +class ABCNews24(BaseChannel): + playable = False + short_name = 'abc24' + long_name = 'ABC News 24' + default_action = 'list_streams' + + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'ABC News 24 - (Australia Only)', 'stream_url': 'http://www.abc.net.au/res/streaming/video/hls/news24.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'ABC News 24', 'stream_url': 'rtmp://cp103653.live.edgefcs.net:1935/live?_fcs_vhost=cp103653.live.edgefcs.net&akmfv=1.8 playpath=international_medium@36382 swfVfy=true live=true'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +######### +## BBC ## +######### + +class BBCNEWS(BaseChannel): + playable = False short_name = 'bbc' - long_name = 'BBC World News' + long_name = 'BBC' + default_action = 'list_streams' + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'BBC World', 'stream_url': 'http://origin2.voronezh.ertelecom.ru/content/private/s147213/d3720264/r971567sd2000000/4dc056d69c5791101b1c85419bce537a665e6eb2/track_2_1200/playlist.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'BBC Arabic', 'stream_url': 'http://wpc.C1A9.edgecastcdn.net/hls-live/20C1A9/bbc_ar/ls_satlink/b_,264,528,828,.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'BBC Persian', 'stream_url': 'http://wpc.C1A9.edgecastcdn.net/hls-live/20C1A9/bbc_persian/ls_satlink/b_,264,528,828,.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +########## +## CNBC ## +########## + +class CNBC(BaseChannel): + playable = True + short_name = 'cnbc' + long_name = 'CNBC' default_action = 'play_stream' def action_play_stream(self): - self.plugin.set_stream_url('rtmp://media2.lsops.net/live/ playpath=bbcworld1_en_high.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageUrl="http://www.livestation.com/channels/10-bbc-world-news-english" swfVfy=true live=true') + self.plugin.set_stream_url('http://origin2.live.web.tv.streamprovider.net/streams/3bc166ba3776c04e987eb242710e75c0/index.m3u8') + +########## +## CBSN ## +########## + +class CBSN(BaseChannel): + playable = True + short_name = 'cbsn' + long_name = 'CBS News' + default_action = 'play_stream' + def action_play_stream(self): + self.plugin.set_stream_url('http://cbsnews-linear.mdialog.com/video_assets/cbsnews.m3u8?api_key=563b80c1ae4ce359830f572d2496a947&iu=/8264/vaw-can/mobile_web/cbsnews_mobile') + +######## +## RT ## +######## class RT(BaseChannel): playable = False @@ -69,45 +179,210 @@ class RT(BaseChannel): def action_list_streams(self): data = {} data.update(self.args) - data.update({'action': 'play_stream', 'Title': 'English', 'stream_url': 'rtmp://fms5.visionip.tv/live app=live swfUrl=http://rt.com/s/swf/player5.4.viral.swf pageURL=http://rt.com/on-air/ playpath=RT_3 live=true'}) + data.update({'action': 'play_stream', 'Title': 'Global', 'stream_url': 'http://rt-a.akamaihd.net/ch_01@325605/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Spanish', 'stream_url': 'http://rt-a.akamaihd.net/ch_02@325606/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Arabic', 'stream_url': 'http://rt-a.akamaihd.net/ch_03@325607/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Spanish', 'stream_url': 'rtmp://rt.fms.visionip.tv/live/ app=live swfurl=http://actualidad.rt.com/swf/player.swf pageurl=http://actualidad.rt.com/mas/envivo/ playpath=RT_Spanish_3 swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'America', 'stream_url': 'http://rt-a.akamaihd.net/ch_04@325608/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Arabic', 'stream_url': 'rtmp://russiatoday.fms.visionip.tv/rt/Russia_al_yaum_1000k_1 app=rt/Russia_al_yaum_1000k_1 swfurl=http://arabic.rt.com/style/liveplayer.swf pageurl=http://arabic.rt.com/live_high playpath=1000k_1 swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'UK', 'stream_url': '"http://rt-a.akamaihd.net/ch_06@325610/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Documentaries', 'stream_url': 'http://rt-a.akamaihd.net/ch_05@325609/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() def action_play_stream(self): self.plugin.set_stream_url(self.args['stream_url']) + +############# +## i24news ## +############# + +class i24news(BaseChannel): + playable = False + short_name = 'i24news' + long_name = 'i24news' + default_action = 'list_streams' -class ABCNews24(BaseChannel): - playable=True - short_name = 'abc24' - long_name = "ABC News 24 (Australia)" - default_action = 'play_stream' + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'English', 'stream_url': 'http://bcoveliveios-i.akamaihd.net/hls/live/215102/master_english/398/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'French', 'stream_url': 'http://bcoveliveios-i.akamaihd.net/hls/live/215102/master_french/412/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Arabic', 'stream_url': 'http://bcoveliveios-i.akamaihd.net/hls/live/215102/master_arabic/391/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() def action_play_stream(self): - self.plugin.set_stream_url("rtmp://cp103653.live.edgefcs.net:1935/live?_fcs_vhost=cp103653.live.edgefcs.net&akmfv=1.8 playpath=international_medium@36382 swfVfy=true live=true") + self.plugin.set_stream_url(self.args['stream_url']) +############## +## EuroNews ## +############## + class EuroNews(BaseChannel): - playable = True + playable = False short_name = 'euronews' long_name = 'EuroNews' + default_action = 'list_streams' + + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'Arabic', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/ar_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'English', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/en_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'French', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/fr_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'German', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/de_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Italian', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/it_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Portuguese', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/pt_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Russian', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/ru_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Spanish', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/es_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Turkish', 'stream_url': 'rtsp://ewns-hls-b-stream.hexaglobe.net/rtpeuronewslive/tr_vidan750_rtp.sdp'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +############# +## NASA TV ## +############# + +class NASATV(BaseChannel): + playable = False + short_name = 'nasatv_en' + long_name = 'NASA TV' + default_action = 'list_streams' + + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'NASA TV', 'stream_url': 'http://iphone-streaming.ustream.tv/uhls/6540154/streams/live/iphone/playlist.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'NASA TV HD', 'stream_url': 'http://nasatv-lh.akamaihd.net/i/NASA_101@319270/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'NASA TV Media Channel HD', 'stream_url': 'http://nasatv-lh.akamaihd.net/i/NASA_103@319271/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'NASA TV Educational Channel HD', 'stream_url': 'http://nasatv-lh.akamaihd.net/i/NASA_102@319272/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'NASA ISS HD Earth Viewing', 'stream_url': 'http://iphone-streaming.ustream.tv/uhls/17074538/streams/live/iphone/playlist.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +############# +## Reuters ## +############# + +class REUTERS(BaseChannel): + playable = True + short_name = 'reuters' + long_name = 'Reuters' default_action = 'play_stream' def action_play_stream(self): - self.plugin.set_stream_url('rtmp://media2.lsops.net/live/ playpath=euronews_en_high.sdp swfUrl="http://www.livestation.com/flash/player/5.4/player.swf" pageUrl="http://www.livestation.com/channels/1-euronews-english" swfVfy=true live=true') - - + self.plugin.set_stream_url('http://37.58.85.156/rlo001/ngrp:rlo001.stream_all/playlist.m3u8') -class NASAHD(BaseChannel): +################ +## Rai News24 ## +################ + +class RAINEWS24(BaseChannel): + playable = False + short_name = 'rainews24' + long_name = 'Rai News24 (Geo-restricted)' + default_action = 'list_streams' + + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'Medium Quality', 'stream_url': 'rtmp://rainews.lsops.net/live/ playpath=rainews_it_584 swfUrl="http://static.ls-cdn.com/player/5.10/livestation-player.swf" swfVfy=true live=true'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Mobile Quality', 'stream_url': 'http://rainews.lsops.net/live/rainews_it_hls.smil/playlist.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +############# +## PressTV ## +############# + +class PRESSTV(BaseChannel): playable = True - short_name = 'nasahd' - long_name = 'NASA HD' + short_name = 'press_tv' + long_name = 'PressTV' default_action = 'play_stream' def action_play_stream(self): - self.plugin.set_stream_url('rtmp://flash86.ustream.tv:1935/ustreamVideo/6540154 playpath=streams/live app=ustreamVideo/6540154 swfUrl="http://cdn1.ustream.tv/swf/4/viewer.rsl.558.swf" pageUrl="http://www.nasa.gov/multimedia/nasatv/ustream.html" live=true') + self.plugin.set_stream_url('rtmp://mtv.fms-01.visionip.tv/live/&file=mtv-ptv-live-25f-16x9-SDh&type=rtmp&rtmp.subscribe=true&autostart=true&stretching=exactfit') + +############### +## Bloomberg ## +############### + +class BLOOMBERG(BaseChannel): + playable = True + short_name = 'bloomberg_en' + long_name = 'Bloomberg Television' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://live.bltvios.com.edgesuite.net/tv/us/master.m3u8') + +#################################### +## Channel NewsAsia International ## +#################################### + +class CNAI(BaseChannel): + playable=True + short_name = 'channel_newsasia' + long_name = "Channel NewsAsia International (Geo-restricted)" + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://cna_hls-lh.akamaihd.net/i/cna_en@8000/master.m3u8') + +############## +## Sky News ## +############## + +class SkyNews(BaseChannel): + playable = False + short_name = 'skynews' + long_name = 'Sky News' + default_action = 'list_streams' + + def action_list_streams(self): + data = {} + data.update(self.args) + data.update({'action': 'play_stream', 'Title': 'Sky News Live HD (Geo-restricted)', 'stream_url': 'plugin://plugin.video.youtube/?action=play_video&videoid=y60wDzZt8yg'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'Sky News International', 'stream_url': 'http://wpc.C1A9.edgecastcdn.net/hls-live/20C1A9/skynews/ls_satlink/b_,264,528,828,.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +############## +## France24 ## +############## class France24(BaseChannel): playable = False @@ -118,65 +393,208 @@ class France24(BaseChannel): def action_list_streams(self): data = {} data.update(self.args) - data.update({'action': 'play_stream', 'Title': 'English', 'stream_url': 'rtmp://stream2.france24.yacast.net/france24_live/en/ playpath=f24_liveen swfUrl="http://www.france24.com/en/sites/all/modules/maison/aef_player/flash/player.swf" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'English', 'stream_url': 'http://static.france24.com/live/F24_EN_LO_HLS/live_ios.m3u8'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'action': 'play_stream', 'Title': 'Francais', 'stream_url': 'rtmp://stream2.france24.yacast.net/france24_live/fr/ playpath=f24_livefr swfUrl="http://www.france24.com/fr/sites/all/modules/maison/aef_player/flash/player.swf" swfVfy=true live=true'}) + data.update({'action': 'play_stream', 'Title': 'French', 'stream_url': 'http://static.france24.com/live/F24_FR_LO_HLS/live_ios.m3u8'}) self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() def action_play_stream(self): self.plugin.set_stream_url(self.args['stream_url']) -class CSpan(BaseChannel): +#################### +## Deutsche Welle ## +#################### + +class DW(BaseChannel): playable = False - short_name = 'cspan' - long_name = 'CSPAN' + short_name = 'dw' + long_name = 'Deutsche Welle (DW)' default_action = 'list_streams' - swf_url = 'http://www.c-span.org/cspanVideoHD.swf' def action_list_streams(self): data = {} data.update(self.args) - data['action'] = 'play_stream' - data.update({'stream_url': "rtmp://cp82346.live.edgefcs.net:1935/live/CSPAN1@14845", 'Title': 'CSPAN1'}) + data.update({'action': 'play_stream', 'Title': 'DW (German)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv/ios/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'DW (North America)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv-northamerica/ios/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'DW (Arabia)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv-arabia/ios/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'stream_url': "rtmp://cp82347.live.edgefcs.net:1935/live/CSPAN2@14846", 'Title': 'CSPAN2'}) + data.update({'action': 'play_stream', 'Title': 'DW (Asia)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv-asia/ios/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'stream_url': "rtmp://cp82348.live.edgefcs.net:1935/live/CSPAN3@14847", 'Title': 'CSPAN3'}) + data.update({'action': 'play_stream', 'Title': 'DW (Europe)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv-europa/ios/master.m3u8'}) + self.plugin.add_list_item(data, is_folder=False) + data.update({'action': 'play_stream', 'Title': 'DW (Latinoamerica)', 'stream_url': 'http://www.metafilegenerator.de/DWelle/tv-latinoamerica/ios/master.m3u8'}) self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) +############### +## NHK WORLD ## +############### + +#class NHK(BaseChannel): +# playable = True +# short_name = 'nhk_world' +# long_name = 'NHK World TV' +# default_action = 'play_stream' +# +# def action_play_stream(self): +# self.plugin.set_stream_url('http://plslive-w.nhk.or.jp/nhkworld/app/live.m3u8') +############### +## CCTV News ## +############### + +class CCTV(BaseChannel): + playable = True + short_name = 'cctv_news_english' + long_name = 'CCTV News' + default_action = 'play_stream' + def action_play_stream(self): - parser = URLParser(swf_url = self.swf_url) - self.plugin.set_stream_url(parser(self.args['stream_url'])) + self.plugin.set_stream_url('http://origin2.live.web.tv.streamprovider.net/streams/877ba7a57aa68fd898b838f58d51a69f/index.m3u8') - +######### +## CNN ## +######### + class CNN(BaseChannel): playable = False short_name = 'cnn' - long_name = 'CNN' + long_name = 'CNN International' default_action = 'list_streams' - swf_url = 'http://i.cdn.turner.com/cnn/.element/apps/CNNLive/2.1.5.7/assets/swfs/LivePlayer.swf' + def action_list_streams(self): + data = {} + data.update(self.args) + data['action'] = 'play_stream' + data.update({'stream_url': "http://d1hya96e2cm7qi.cloudfront.net/Live/_definst_/sweetbcha1novD177_W_150.sdp/media_7419.m3u8", 'Title': 'Low Quality'}) + self.plugin.add_list_item(data, is_folder=False) + #data.update({'stream_url': "rtmp://c.cdn.livenewschat.eu/edge/ playpath=cnn_live swfUrl='http://msnbclive.eu/player.swf' swfVfy=true live=true", 'Title': 'CNN UK'}) + #self.plugin.add_list_item(data, is_folder=False) + self.plugin.end_list() + + def action_play_stream(self): + self.plugin.set_stream_url(self.args['stream_url']) + +############## +## 24 Vesti ## +############## + +class VESTI(BaseChannel): + playable = True + short_name = '24vesti' + long_name = '24 Vesti' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('mms://62.162.58.55/24vesti') + +################### +## UKRAINE TODAY ## +################### + +class UT(BaseChannel): + playable = True + short_name = 'ut' + long_name = 'UKRAINE TODAY' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://stream2g06-g50.1plus1.ua/380555/smil:380555.smil/playlist.m3u8') + +############### +## NDTV 24x7 ## +############### +class NDTV(BaseChannel): + playable = True + short_name = 'ndtv_24x7' + long_name = 'NDTV 24x7' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('hhttp://bglive-a.bitgravity.com/ndtv/247hi/live/native') + +################### +## tagessschau24 ## +################### + +class Tagesschau24(BaseChannel): + playable = True + short_name = 'tagesschau24' + long_name = 'tagesschau24' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8') + +######### +## N24 ## +######### + +class N24(BaseChannel): + playable = True + short_name = 'n24_de' + long_name = 'N24' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://n24-live.hls.adaptive.level3.net/n24/live2cms/live2cms.m3u8') + +########### +## CSpan ## +########### + +class CSpan(BaseChannel): + playable = False + short_name = 'cspan_en' + long_name = 'CSPAN' + default_action = 'list_streams' + swf_url = 'http://www.c-span.org/cspanVideoHD.swf' + def action_list_streams(self): data = {} data.update(self.args) data['action'] = 'play_stream' - data.update({'stream_url': "rtmp://cp44679.live.edgefcs.net/live/cnn_stream1_low@2785", 'stream_number': 1, 'Title': 'CNN 1'}) + data.update({'stream_url': "rtmp://cp82346.live.edgefcs.net/live/CSPAN1@14845", 'Title': 'CSPAN1'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'stream_url': "rtmp://cp44679.live.edgefcs.net/live/cnn_stream2_low@2787", 'stream_number': 2, 'Title': 'CNN 2'}) + data.update({'stream_url': "rtmp://cp82347.live.edgefcs.net/live/CSPAN2@14846", 'Title': 'CSPAN2'}) self.plugin.add_list_item(data, is_folder=False) - data.update({'stream_url': "rtmp://cp44679.live.edgefcs.net/live/cnn_stream3_low@2796", 'stream_number': 3, 'Title': 'CNN 3'}) - self.plugin.add_list_item(data, is_folder=False) - data.update({'stream_url': "rtmp://cp44679.live.edgefcs.net/live/cnn_stream4_low@2797", 'stream_number': 4, 'Title': 'CNN 4'}) + data.update({'stream_url': "rtmp://cp82348.live.edgefcs.net/live/CSPAN3@14847", 'Title': 'CSPAN3'}) self.plugin.add_list_item(data, is_folder=False) self.plugin.end_list() def action_play_stream(self): parser = URLParser(swf_url = self.swf_url) - self.plugin.set_stream_url(parser(self.args['stream_url'])) - - + self.plugin.set_stream_url(parser(self.args['stream_url'])) + +############# +## Digi 24 ## +############# + +class Digi24(BaseChannel): + playable = True + short_name = 'digi24' + long_name = 'Digi 24' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://82.76.249.77:80/digi24edge/digi24hdhqhls/index.m3u8') +######### +## TWC ## +######### + +class TWC(BaseChannel): + playable = True + short_name = 'twc_us' + long_name = 'The Weather Channels US' + default_action = 'play_stream' + + def action_play_stream(self): + self.plugin.set_stream_url('http://cdnapi.kaltura.com/p/931702/sp/93170200/playManifest/entryId/1_oorxcge2/format/applehttp/protocol/http/uiConfId/28428751/a.m3u8') diff --git a/default.py b/default.py index f2c90eb..4212ca3 100644 --- a/default.py +++ b/default.py @@ -13,10 +13,10 @@ from pysqlite2 import dbapi2 as sqlite __plugin__ = "World News Live" -__author__ = 'Andre ' -__url__ = 'http://github.com/andrepl/plugin.video.world.news.live/' -__date__ = '05-18-2011' -__version__ = '1.2.4' +__author__ = 'Florian Neagu ' +__url__ = 'http://world-news-live.googlecode.com/svn/trunk' +__date__ = '1-10-2013' +__version__ = '1.2.7' __settings__ = xbmcaddon.Addon(id='plugin.video.world.news.live') @@ -267,7 +267,7 @@ def add_list_item(self, info, is_folder=True, return_only=False, li=xbmcgui.ListItem( label=info['Title'], - iconImage=info['Icon'], + iconImage=unicode(info['Icon']), thumbnailImage=info['Thumb'] ) diff --git a/icon.png b/icon.png old mode 100755 new mode 100644 index ace7d66..4e235ab Binary files a/icon.png and b/icon.png differ diff --git a/resources/images/channels/24vesti.png b/resources/images/channels/24vesti.png new file mode 100644 index 0000000..ff0c7a6 Binary files /dev/null and b/resources/images/channels/24vesti.png differ diff --git a/resources/images/channels/abc24.png b/resources/images/channels/abc24.png index c5639d0..31a895b 100644 Binary files a/resources/images/channels/abc24.png and b/resources/images/channels/abc24.png differ diff --git a/resources/images/channels/abcnews.png b/resources/images/channels/abcnews.png new file mode 100644 index 0000000..6b3ee4a Binary files /dev/null and b/resources/images/channels/abcnews.png differ diff --git a/resources/images/channels/alaan.png b/resources/images/channels/alaan.png new file mode 100644 index 0000000..4d584e2 Binary files /dev/null and b/resources/images/channels/alaan.png differ diff --git a/resources/images/channels/alalam.png b/resources/images/channels/alalam.png new file mode 100644 index 0000000..8ed0e75 Binary files /dev/null and b/resources/images/channels/alalam.png differ diff --git a/resources/images/channels/aljazeera.png b/resources/images/channels/aljazeera.png deleted file mode 100644 index c104c5c..0000000 Binary files a/resources/images/channels/aljazeera.png and /dev/null differ diff --git a/resources/images/channels/aljazeera_ar.png b/resources/images/channels/aljazeera_ar.png index 8ca131b..85b64e0 100644 Binary files a/resources/images/channels/aljazeera_ar.png and b/resources/images/channels/aljazeera_ar.png differ diff --git a/resources/images/channels/aljazeera_en.png b/resources/images/channels/aljazeera_en.png new file mode 100644 index 0000000..39d75d4 Binary files /dev/null and b/resources/images/channels/aljazeera_en.png differ diff --git a/resources/images/channels/aljazeera_us.png b/resources/images/channels/aljazeera_us.png new file mode 100644 index 0000000..7eaa691 Binary files /dev/null and b/resources/images/channels/aljazeera_us.png differ diff --git a/resources/images/channels/almayadeen.png b/resources/images/channels/almayadeen.png new file mode 100644 index 0000000..2e63050 Binary files /dev/null and b/resources/images/channels/almayadeen.png differ diff --git a/resources/images/channels/alnabaa.png b/resources/images/channels/alnabaa.png new file mode 100644 index 0000000..0fd40fe Binary files /dev/null and b/resources/images/channels/alnabaa.png differ diff --git a/resources/images/channels/antena3.png b/resources/images/channels/antena3.png new file mode 100644 index 0000000..e9b71b1 Binary files /dev/null and b/resources/images/channels/antena3.png differ diff --git a/resources/images/channels/arirang_world.png b/resources/images/channels/arirang_world.png new file mode 100644 index 0000000..5bb92d1 Binary files /dev/null and b/resources/images/channels/arirang_world.png differ diff --git a/resources/images/channels/bbc.png b/resources/images/channels/bbc.png index f284cdc..a7bdc82 100644 Binary files a/resources/images/channels/bbc.png and b/resources/images/channels/bbc.png differ diff --git a/resources/images/channels/bbc_arabic.png b/resources/images/channels/bbc_arabic.png new file mode 100644 index 0000000..6db95fb Binary files /dev/null and b/resources/images/channels/bbc_arabic.png differ diff --git a/resources/images/channels/bbc_persian.png b/resources/images/channels/bbc_persian.png new file mode 100644 index 0000000..1cdbe11 Binary files /dev/null and b/resources/images/channels/bbc_persian.png differ diff --git a/resources/images/channels/bbcnews_en.png b/resources/images/channels/bbcnews_en.png new file mode 100644 index 0000000..66d3094 Binary files /dev/null and b/resources/images/channels/bbcnews_en.png differ diff --git a/resources/images/channels/bbcworld_en.png b/resources/images/channels/bbcworld_en.png new file mode 100644 index 0000000..6a5f09e Binary files /dev/null and b/resources/images/channels/bbcworld_en.png differ diff --git a/resources/images/channels/bigpond_news.png b/resources/images/channels/bigpond_news.png new file mode 100644 index 0000000..a0697d8 Binary files /dev/null and b/resources/images/channels/bigpond_news.png differ diff --git a/resources/images/channels/bloomberg_en.png b/resources/images/channels/bloomberg_en.png new file mode 100644 index 0000000..78e6cbe Binary files /dev/null and b/resources/images/channels/bloomberg_en.png differ diff --git a/resources/images/channels/cbsn.png b/resources/images/channels/cbsn.png new file mode 100644 index 0000000..3b712fd Binary files /dev/null and b/resources/images/channels/cbsn.png differ diff --git a/resources/images/channels/cctv_news_english.png b/resources/images/channels/cctv_news_english.png new file mode 100644 index 0000000..8d70ba8 Binary files /dev/null and b/resources/images/channels/cctv_news_english.png differ diff --git a/resources/images/channels/channel_newsasia.png b/resources/images/channels/channel_newsasia.png new file mode 100644 index 0000000..c983d80 Binary files /dev/null and b/resources/images/channels/channel_newsasia.png differ diff --git a/resources/images/channels/cnbc.png b/resources/images/channels/cnbc.png new file mode 100644 index 0000000..21a2ab2 Binary files /dev/null and b/resources/images/channels/cnbc.png differ diff --git a/resources/images/channels/cnn.png b/resources/images/channels/cnn.png index 43e45c5..bd9abba 100644 Binary files a/resources/images/channels/cnn.png and b/resources/images/channels/cnn.png differ diff --git a/resources/images/channels/cspan.png b/resources/images/channels/cspan.png deleted file mode 100644 index d59f9f2..0000000 Binary files a/resources/images/channels/cspan.png and /dev/null differ diff --git a/resources/images/channels/cspan_en.png b/resources/images/channels/cspan_en.png new file mode 100644 index 0000000..104bc1a Binary files /dev/null and b/resources/images/channels/cspan_en.png differ diff --git a/resources/images/channels/digi24.png b/resources/images/channels/digi24.png new file mode 100644 index 0000000..186cdcf Binary files /dev/null and b/resources/images/channels/digi24.png differ diff --git a/resources/images/channels/dw.png b/resources/images/channels/dw.png new file mode 100644 index 0000000..23d51ae Binary files /dev/null and b/resources/images/channels/dw.png differ diff --git a/resources/images/channels/enca.png b/resources/images/channels/enca.png new file mode 100644 index 0000000..7487dd2 Binary files /dev/null and b/resources/images/channels/enca.png differ diff --git a/resources/images/channels/euronews.png b/resources/images/channels/euronews.png index 5475744..ff80822 100644 Binary files a/resources/images/channels/euronews.png and b/resources/images/channels/euronews.png differ diff --git a/resources/images/channels/france24.png b/resources/images/channels/france24.png index ca28030..30777b5 100644 Binary files a/resources/images/channels/france24.png and b/resources/images/channels/france24.png differ diff --git a/resources/images/channels/i24news.png b/resources/images/channels/i24news.png new file mode 100644 index 0000000..db1ab8a Binary files /dev/null and b/resources/images/channels/i24news.png differ diff --git a/resources/images/channels/mhz_worldview.png b/resources/images/channels/mhz_worldview.png new file mode 100644 index 0000000..0e11945 Binary files /dev/null and b/resources/images/channels/mhz_worldview.png differ diff --git a/resources/images/channels/n24_de.png b/resources/images/channels/n24_de.png new file mode 100644 index 0000000..ee1592f Binary files /dev/null and b/resources/images/channels/n24_de.png differ diff --git a/resources/images/channels/nasahd.png b/resources/images/channels/nasahd.png deleted file mode 100644 index ff8d142..0000000 Binary files a/resources/images/channels/nasahd.png and /dev/null differ diff --git a/resources/images/channels/nasatv_en.png b/resources/images/channels/nasatv_en.png new file mode 100644 index 0000000..44055bc Binary files /dev/null and b/resources/images/channels/nasatv_en.png differ diff --git a/resources/images/channels/ndtv_24x7.png b/resources/images/channels/ndtv_24x7.png new file mode 100644 index 0000000..bf325fa Binary files /dev/null and b/resources/images/channels/ndtv_24x7.png differ diff --git a/resources/images/channels/nhk_world.png b/resources/images/channels/nhk_world.png new file mode 100644 index 0000000..22e867a Binary files /dev/null and b/resources/images/channels/nhk_world.png differ diff --git a/resources/images/channels/press_tv.png b/resources/images/channels/press_tv.png new file mode 100644 index 0000000..8d167e5 Binary files /dev/null and b/resources/images/channels/press_tv.png differ diff --git a/resources/images/channels/rainews24.png b/resources/images/channels/rainews24.png new file mode 100644 index 0000000..0ebd731 Binary files /dev/null and b/resources/images/channels/rainews24.png differ diff --git a/resources/images/channels/reuters.png b/resources/images/channels/reuters.png new file mode 100644 index 0000000..fcc258c Binary files /dev/null and b/resources/images/channels/reuters.png differ diff --git a/resources/images/channels/rt.png b/resources/images/channels/rt.png index 4f8a41f..d605b65 100644 Binary files a/resources/images/channels/rt.png and b/resources/images/channels/rt.png differ diff --git a/resources/images/channels/skynews.png b/resources/images/channels/skynews.png new file mode 100644 index 0000000..940441a Binary files /dev/null and b/resources/images/channels/skynews.png differ diff --git a/resources/images/channels/tagesschau24.png b/resources/images/channels/tagesschau24.png new file mode 100644 index 0000000..4e52007 Binary files /dev/null and b/resources/images/channels/tagesschau24.png differ diff --git a/resources/images/channels/tpv.png b/resources/images/channels/tpv.png new file mode 100644 index 0000000..c1b3a39 Binary files /dev/null and b/resources/images/channels/tpv.png differ diff --git a/resources/images/channels/twc_us.png b/resources/images/channels/twc_us.png new file mode 100644 index 0000000..b0aea5f Binary files /dev/null and b/resources/images/channels/twc_us.png differ diff --git a/resources/images/channels/ut.png b/resources/images/channels/ut.png new file mode 100644 index 0000000..4a34fdf Binary files /dev/null and b/resources/images/channels/ut.png differ diff --git a/resources/images/channels/voapersian.png b/resources/images/channels/voapersian.png new file mode 100644 index 0000000..ad62036 Binary files /dev/null and b/resources/images/channels/voapersian.png differ diff --git a/resources/language/english/strings.xml b/resources/language/english/strings.xml index bb2bea7..cebe59d 100644 --- a/resources/language/english/strings.xml +++ b/resources/language/english/strings.xml @@ -1,9 +1,9 @@ - - Display Empty Categories (Shows with no clips) - HTTP Proxy Server - HTTP Proxy Server port - Hide Channels Worse Than - Automatically Play All Clips(SVN 32470+) - Maximum Bitrate - - + + Display Empty Categories (Shows with no clips) + HTTP Proxy Server + HTTP Proxy Server port + Hide Channels Worse Than + Automatically Play All Clips(SVN 32470+) + Maximum Bitrate + + diff --git a/resources/language/german/strings.xml b/resources/language/german/strings.xml new file mode 100644 index 0000000..6c3712d --- /dev/null +++ b/resources/language/german/strings.xml @@ -0,0 +1,9 @@ + + Leere Kategorien einblenden (Shows ohne Clips) + HTTP Proxy Server + HTTP Proxy Server port + Kan�le ausblenden Worse Than + Automatische Wiedergabe Alle Clips (SVN 32470 +) + Maximale Bitrate + + diff --git a/resources/settings.xml b/resources/settings.xml index 296fd0a..67cf8cf 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/utils.py b/utils.py index 6ca3b9b..4f1bfe8 100644 --- a/utils.py +++ b/utils.py @@ -78,7 +78,8 @@ def clean(self): def get_base_url(self): print self.data - url = "%(scheme)s://%(netloc)s/%(app)s?ovpfv=2.1.4" % self.data + #url = "%(scheme)s://%(netloc)s/%(app)s?ovpfv=2.1.4" % self.data + url = "%(scheme)s://%(netloc)s/%(app)s/" % self.data if self.data['querystring']: url += "&%(querystring)s" % self.data return url