The branch, eden has been updated
via a1bcca9819285f126739fac1de35d6922ef342e3 (commit)
via bf802a86ff029b3019bbb0ff00de94e50ebcbadc (commit)
via b841a8c09c9cec67dbe03f271bd28a1cd5aca37a (commit)
via e0860f01836f95b2e5dd02bb24d335078c0443c8 (commit)
via 0f4eabcba2f119f4e62854a6e006360f8d78f4d7 (commit)
from fdf7189e5307948c5a741ca0c9c6d23d84df9f28 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a1bcca9819285f126739fac1de35d6922ef342e3
commit a1bcca9819285f126739fac1de35d6922ef342e3
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 1 19:32:17 2012 +0200
[plugin.video.svtplay] -v2.0.4
diff --git a/plugin.video.svtplay/addon.xml b/plugin.video.svtplay/addon.xml
index 2a2bf29..9f07549 100644
--- a/plugin.video.svtplay/addon.xml
+++ b/plugin.video.svtplay/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.svtplay"
name="SVT Play"
- version="2.0.3"
+ version="2.0.4"
provider-name="nilzen">
<requires>
<import addon="xbmc.python" version="2.0"/>
@@ -10,6 +10,7 @@
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
+ <language>sv</language>
<summary lang="en">Watch content from SVT Play.</summary>
<summary lang="sv">Titta på innehåll från SVT Play.</summary>
<description lang="en">With this addon you can stream content from SVT
Play (svtplay.se).</description>
diff --git a/plugin.video.svtplay/changelog.txt
b/plugin.video.svtplay/changelog.txt
index 703f679..a56e0c2 100644
--- a/plugin.video.svtplay/changelog.txt
+++ b/plugin.video.svtplay/changelog.txt
@@ -1,3 +1,7 @@
+Version 2.0.4
+-------------
+- Updated SWF-player URL (by dahlSTROM)
+
Version 2.0.3
-------------
- Better exception handling and removed unplausible todo (by arvidericsson)
diff --git a/plugin.video.svtplay/default.py b/plugin.video.svtplay/default.py
index c53d8c1..85f2d55 100644
--- a/plugin.video.svtplay/default.py
+++ b/plugin.video.svtplay/default.py
@@ -37,7 +37,7 @@ BASE_URL_TITLE = "http://xml.svtplay.se/v1/title/list/";
BASE_URL_VIDEO = "http://xml.svtplay.se/v1/video/list/";
BASE_URL_SEARCH_TITLE = "http://xml.svtplay.se/v1/title/search/";
BASE_URL_SEARCH_VIDEO = "http://xml.svtplay.se/v1/video/search/";
-SWF_PLAYER_URL = "http://svtplay.se/flash/svtplayer-2012.1.swf";
+SWF_PLAYER_URL = "http://www.svtplay.se/public/swf/video/svtplayer-2012.28.swf";
END_URL_SEARCH_VIDEO = "expression=full"
END_URL_SEARCH_CLIP = "expression=sample"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=bf802a86ff029b3019bbb0ff00de94e50ebcbadc
commit bf802a86ff029b3019bbb0ff00de94e50ebcbadc
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 1 19:28:55 2012 +0200
[plugin.video.dr.dk.live] -v2.1.7
diff --git a/plugin.video.dr.dk.live/addon.py b/plugin.video.dr.dk.live/addon.py
index 43462f5..cc49194 100644
--- a/plugin.video.dr.dk.live/addon.py
+++ b/plugin.video.dr.dk.live/addon.py
@@ -109,17 +109,19 @@ class DanishLiveTV(object):
break
def imInDenmark(self):
+ if ADDON.getSetting('warn.if.not.in.denmark') != 'true':
+ return # Don't bother checking
+
try:
- u =
urllib2.urlopen('http://www.dr.dk/nu/api/estoyendinamarca.json')
+ u =
urllib2.urlopen('http://www.dr.dk/nu/api/estoyendinamarca.json', timeout = 30)
response = u.read()
u.close()
-
imInDenmark = 'true' == response
except Exception:
# If an error occurred assume we are not in Denmark
imInDenmark = False
- if not imInDenmark and ADDON.getSetting('warn.if.not.in.denmark') ==
'true':
+ if not imInDenmark:
heading = ADDON.getLocalizedString(99970)
line1 = ADDON.getLocalizedString(99971)
line2 = ADDON.getLocalizedString(99972)
diff --git a/plugin.video.dr.dk.live/addon.xml
b/plugin.video.dr.dk.live/addon.xml
index b5756bf..324faff 100644
--- a/plugin.video.dr.dk.live/addon.xml
+++ b/plugin.video.dr.dk.live/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
- id="plugin.video.dr.dk.live" version="2.1.6" name="Danish Live TV"
provider-name="twinther [[email protected]]">
+ id="plugin.video.dr.dk.live" version="2.1.7" 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"/>
diff --git a/plugin.video.dr.dk.live/changelog.txt
b/plugin.video.dr.dk.live/changelog.txt
index e11c2cd..ac3bdeb 100644
--- a/plugin.video.dr.dk.live/changelog.txt
+++ b/plugin.video.dr.dk.live/changelog.txt
@@ -1,3 +1,9 @@
+[B]Version 2.1.7 - 2012-08-01[/B]
+- Fixed Kanal Sport, TV/Midt-Vest, TV2/Ãst
+- Added retries and error handling to resolve TV2/Regions stream host
+- Increased timeout to Danish IP check
+ If you get the error incorrectly just disable the check and it will be
skipped completely.
+
[B]Version 2.1.6 - 2012-04-25[/B]
- Updated URLs for some TV2/Regions (by request from Fynske Medier)
diff --git a/plugin.video.dr.dk.live/channels.py
b/plugin.video.dr.dk.live/channels.py
index c762564..d59412b 100644
--- a/plugin.video.dr.dk.live/channels.py
+++ b/plugin.video.dr.dk.live/channels.py
@@ -80,14 +80,21 @@ class Channel(object):
class TV2RChannel(Channel):
def get_url(self, quality, idx = 0):
url = super(TV2RChannel, self).get_url(quality, idx)
- return url.replace('<HOST>', self.get_host_ip())
+ if url is not None:
+ return url.replace('<HOST>', self.get_host_ip())
+ else:
+ return None
def get_host_ip(self):
- u = urllib2.urlopen('http://livestream.fynskemedier.dk/loadbalancer')
- s = u.read()
- u.close()
-
- return s[9:]
+ for attempt in range(0, 2):
+ try:
+ u =
urllib2.urlopen('http://livestream.fynskemedier.dk/loadbalancer')
+ s = u.read()
+ u.close()
+ return s[9:]
+ except Exception:
+ pass # probably timeout; retry
+ return 'unable.to.get.host.from.loadbalancer'
# http://dr.dk/nu/embed/live?height=467&width=830
# DR1
@@ -139,7 +146,7 @@ TV2RChannel(102, CATEGORY_TV2_REG).add_urls(
)
# TV2 Midtvest
Channel(103, CATEGORY_TV2_REG).add_urls(
- high = 'http://ms1.tvmidtvest.dk/live')
+ high = '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',
@@ -148,7 +155,7 @@ TV2RChannel(105, CATEGORY_TV2_REG).add_urls(
)
# TV2 East
Channel(106, CATEGORY_TV2_REG).add_urls(
- best = 'rtmp://tv2regup1.webhotel.net/videostreaming/ playpath=tv2east
live=1'
+ best =
'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(
@@ -171,5 +178,10 @@ Channel(202, CATEGORY_MISC).add_urls(
)
# kanalsport.dk
Channel(203, CATEGORY_MISC).add_urls(
- best =
'http://lswb-de-08.servers.octoshape.net:1935/live/kanalsport/500k/playlist.m3u8'
+ best =
'http://lswb-de-08.servers.octoshape.net:1935/live/kanalsport/1000k/playlist.m3u8'
)
+
+# tv aarhus
+#Channel(204, CATEGORY_MISC).add_urls(
+# best =
'http://flash.digicast.dk/clients_live/digicast/live/playlist.m3u8'
+#)
\ No newline at end of file
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b841a8c09c9cec67dbe03f271bd28a1cd5aca37a
commit b841a8c09c9cec67dbe03f271bd28a1cd5aca37a
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 1 19:26:51 2012 +0200
[plugin.video.4players ] -v1.1.4
diff --git a/plugin.video.4players/addon.py b/plugin.video.4players/addon.py
index ea4c4f3..d37e248 100644
--- a/plugin.video.4players/addon.py
+++ b/plugin.video.4players/addon.py
@@ -1,11 +1,11 @@
from xbmcswift import Plugin
import resources.lib.scraper as scraper
+
class Plugin_adv(Plugin):
def add_items(self, iterable, view_mode=None, is_update=False,
sort_method_ids=[]):
- print is_update
items = []
urls = []
for i, li_info in enumerate(iterable):
@@ -22,7 +22,6 @@ class Plugin_adv(Plugin):
xbmcplugin.addDirectoryItems(self.handle, items, len(items))
for id in sort_method_ids:
xbmcplugin.addSortMethod(self.handle, id)
- print 'added: %d' % id
xbmcplugin.endOfDirectory(self.handle, updateListing=is_update)
return urls
@@ -34,7 +33,7 @@ plugin = Plugin_adv('4Players Videos',
'plugin.video.4players', __file__)
def show_categories():
categories = scraper.getCategories()
cat_ids = (30100, 30101, 30102, 30103, 30104, 30105, 30106, 30107,
- 30108, 30109, 30110)
+ 30108)
items = [{'label': plugin.get_string(cat_ids[i]),
'url': plugin.url_for('show_videos',
category=category, page='1'),
@@ -72,7 +71,7 @@ def show_videos(category, page):
page=prev_page)})
is_update = (int(page) != 1) # only update the listing if page is not 1
sort_method_ids = (21, 3, 29) # Playlist, date, runtime
- return plugin.add_items(items, is_update=is_update,
+ return plugin.add_items(items, is_update=is_update,
sort_method_ids=sort_method_ids)
diff --git a/plugin.video.4players/addon.xml b/plugin.video.4players/addon.xml
index 12864db..191b0a6 100644
--- a/plugin.video.4players/addon.xml
+++ b/plugin.video.4players/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.4players" name="4Players Videos" version="1.1.3"
provider-name="Tristan Fischer (sphere)">
+<addon id="plugin.video.4players" name="4Players Videos" version="1.1.4"
provider-name="Tristan Fischer ([email protected])">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.beautifulsoup" version="3.0.8"/>
@@ -10,6 +10,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
+ <language>de</language>
<summary lang="de">Computerspiel-Videos und -Trailer von
www.4players.de</summary>
<summary lang="en">Watch game videos and trailers from
www.4players.de</summary>
<description lang="de">Bietet aktuelle Videos und Trailer zu Computer- und
Konsolenspielen von der Webseite www.4players.de</description>
diff --git a/plugin.video.4players/changelog.txt
b/plugin.video.4players/changelog.txt
index 72456a6..b187d4c 100644
--- a/plugin.video.4players/changelog.txt
+++ b/plugin.video.4players/changelog.txt
@@ -1,3 +1,9 @@
+1.1.4
+ Fixed Categories
+ Removed deprecated Categories
+ Added provider email
+ cosmetic changes
+
1.1.3
Fixed scraper (Website changes)
diff --git a/plugin.video.4players/resources/language/English/strings.xml
b/plugin.video.4players/resources/language/English/strings.xml
index 6b6e91a..3e6777d 100644
--- a/plugin.video.4players/resources/language/English/strings.xml
+++ b/plugin.video.4players/resources/language/English/strings.xml
@@ -4,12 +4,10 @@
<string id="30100">All</string>
<string id="30101">Most viewed</string>
<string id="30102">Best rated</string>
- <string id="30103">PC</string>
- <string id="30104">PlayStation 2</string>
+ <string id="30103">Video-conclusion</string>
+ <string id="30104">PC</string>
<string id="30105">PlayStation 3</string>
- <string id="30106">Wii</string>
- <string id="30107">Xbox 360</string>
- <string id="30108">Nintendo DS</string>
- <string id="30109">PlayStation Portable</string>
- <string id="30110">Video-Fazit</string>
+ <string id="30106">Xbox 360</string>
+ <string id="30107">Wii</string>
+ <string id="30108">Handhelds</string>
</strings>
diff --git a/plugin.video.4players/resources/language/German/strings.xml
b/plugin.video.4players/resources/language/German/strings.xml
index 126fc88..a201970 100644
--- a/plugin.video.4players/resources/language/German/strings.xml
+++ b/plugin.video.4players/resources/language/German/strings.xml
@@ -4,12 +4,10 @@
<string id="30100">Alle</string>
<string id="30101">Am meisten gesehen</string>
<string id="30102">Am besten bewertet</string>
- <string id="30103">PC</string>
- <string id="30104">PlayStation 2</string>
+ <string id="30103">Video-Fazit</string>
+ <string id="30104">PC</string>
<string id="30105">PlayStation 3</string>
- <string id="30106">Wii</string>
- <string id="30107">Xbox 360</string>
- <string id="30108">Nintendo DS</string>
- <string id="30109">PlayStation Portable</string>
- <string id="30110">Video-Fazit</string>
+ <string id="30106">Xbox 360</string>
+ <string id="30107">Wii</string>
+ <string id="30108">Handhelds</string>
</strings>
diff --git a/plugin.video.4players/resources/lib/scraper.py
b/plugin.video.4players/resources/lib/scraper.py
index cf09946..dedb6fd 100644
--- a/plugin.video.4players/resources/lib/scraper.py
+++ b/plugin.video.4players/resources/lib/scraper.py
@@ -3,14 +3,10 @@ import re
from BeautifulSoup import BeautifulSoup
from urllib import urlencode
-IPAD_USERAGENT = (u'Mozilla/5.0 (iPad; U; CPU OS OS 3_2 like '
- u'Mac OS X; en-us) AppleWebKit/531.21.10 (K'
- u'HTML, like Gecko) Version/4.0.4 Mobile/7B'
- u'367 Safari/531.21.10')
+USER_AGENT = 'XBMC addon plugin.video.4players'
-CATEGORIES = ('Alle', 'TopViews', 'TopRated', 'PC-CDROM',
- 'PlayStation2', 'PlayStation3', 'Wii', '360', 'NDS',
- 'PSP', 'Video-Fazit')
+CATEGORIES = ('Alle', 'TopRated', 'TopViews', 'Video-Fazit', 'PC-CDROM',
+ 'PlayStation3', '360', 'Wii', 'Handhelds')
URL_PREFIX = 'http://www.4players.de/4players.php/tvplayer/'
@@ -22,7 +18,7 @@ def getVideos(filter=None, page=1):
'singlefilter': filter,
'funcname': 'aktuellevideos',
'numcols': 5,
- 'numshown': 50,
+ 'numshown': 20,
'refreshskims': 1}
url = 'http://www.4players.de/paginatecontent.php'
html = __getAjaxContent(url, post)
@@ -36,7 +32,6 @@ def getVideos(filter=None, page=1):
video_frames = section.findAll('li')
videos = list()
for frame in video_frames:
- print frame
link = frame.find('a', {'class': re.compile('tv-weiter-link')})
# title
title = link['title']
@@ -103,7 +98,7 @@ def __getAjaxContent(url, data_dict=None):
else:
post_data = ' '
req = urllib2.Request(url, post_data)
- req.add_header('User-Agent', IPAD_USERAGENT)
+ req.add_header('User-Agent', USER_AGENT)
req.add_header('Accept', 'text/javascript, */*')
req.add_header('Content-Type',
'application/x-www-form-urlencoded; charset=UTF-8')
@@ -115,10 +110,8 @@ def __getAjaxContent(url, data_dict=None):
def getVideoFile(page_url):
video_page = URL_PREFIX + page_url + '.html'
html = __getAjaxContent(video_page)
- #tree = BeautifulSoup(html)
- #link = tree.find('script', text=re.compile('video src'))
r = '<video src="(?P<url>[^"]+)"'
- m = re.search(r,html)
+ m = re.search(r, html)
url = m.groupdict()['url']
return url
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=e0860f01836f95b2e5dd02bb24d335078c0443c8
commit e0860f01836f95b2e5dd02bb24d335078c0443c8
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 1 19:22:38 2012 +0200
[plugin.video.tvvn] -v0.8.1
diff --git a/plugin.video.tvvn/README b/plugin.video.tvvn/README
index ef2d809..4d1d91a 100644
--- a/plugin.video.tvvn/README
+++ b/plugin.video.tvvn/README
@@ -8,4 +8,4 @@ the streams nor that of your internet connection :)
DONATIONS: Given the personal time and effort put in to this little project,
I have decided to accept donations. If you enjoy using the plugin, you can
-make donations via PayPal to b1nhb00ng__at__gmail__dot__com
+make donations via PayPal to b_at_zecoj_dot_com
diff --git a/plugin.video.tvvn/addon.xml b/plugin.video.tvvn/addon.xml
index c937a85..c91e9af 100644
--- a/plugin.video.tvvn/addon.xml
+++ b/plugin.video.tvvn/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.tvvn"
- version="0.8"
+ version="0.8.1"
name="TV Viet Nam"
provider-name="Binh Nguyen">
<requires>
@@ -15,8 +15,8 @@
<language>en vi</language>
<summary lang="en">TV Viet Nam</summary>
<summary lang="vi">TV Viá»t Nam</summary>
- <description lang="en">This plugin allows you to watch live TV
channels or listen to radio stations in Viet Nam or from oversea providers
straight from the XBMC interface, eliminates the needs for using browsers and
flashplayer, etc. Bug report at: zecoj.com. If you enjoy using the plugin,
consider donate via PayPal to b1nhb00ng [AT] gmail [DOT] com</description>
- <description lang="vi">Xem trá»±c tiếp các kênh truyá»n
hình và các Äà i phát thanh từ Viá»t Nam và hải ngoại. If you
enjoy using the plugin, consider donate via PayPal to b1nhb00ng [AT] gmail
[DOT] com</description>
+ <description lang="en">This plugin allows you to watch live TV
channels or listen to radio stations in Viet Nam or from oversea providers
straight from the XBMC interface, eliminates the needs for using browsers and
flashplayer, etc. Bug report at: zecoj.com. If you enjoy using the plugin,
consider donate via PayPal to b [AT] zecoj [DOT] com</description>
+ <description lang="vi">Xem trá»±c tiếp các kênh truyá»n
hình và các Äà i phát thanh từ Viá»t Nam và hải ngoại. If you
enjoy using the plugin, consider donate via PayPal to b [AT] zecoj [DOT]
com</description>
<disclaimer lang="en">All live streams are pulled from online
providers and in no way represent my views or opinions. I also hold no control
over the quality of the streams nor that of your internet connection
:)</disclaimer>
<disclaimer lang="vi">Tất cả live streams Äược tải
vá» từ các nhà cung cấp dá»ch vụ. Tác giả phần má»m nà y không
chá»u trách nhiá»m vá» ná»i dung của chúng.</disclaimer>
</extension>
diff --git a/plugin.video.tvvn/changelog.txt b/plugin.video.tvvn/changelog.txt
index 55ab21a..a09b949 100644
--- a/plugin.video.tvvn/changelog.txt
+++ b/plugin.video.tvvn/changelog.txt
@@ -1,6 +1,9 @@
-version 0.8 (25/07/2012):
- * adding more oversea channels
- * update disclaimer
+version 0.8.1 (27/07/2012):
+ * adds LifeTV and VpopTV (thanks to bolex17)
+
+version 0.8.0 (25/07/2012):
+ * adds more oversea channels
+ * updates disclaimer
* improvements and bug fixes
* code clean up
@@ -19,7 +22,7 @@ version 0.7.1 (28/04/2012):
* VTV1-3 channels will now use streams from tv24.vn
* clean up channels descriptions
-version 0.7 (26/04/2012):
+version 0.7.0 (26/04/2012):
* users can now show/hide channels descriptions via "Add-on Settings"
* more channels (ANTV and 11 local channels)
* change play_video method to work around for tv24.vn
@@ -34,15 +37,15 @@ version 0.5.1 (05/04/2012):
* move to official repository
* new logo
-version 0.5 (25/03/2012):
+version 0.5.0 (25/03/2012):
* improve & add artwork
* add more channels from tv24.com.vn
* repository created
-version 0.3 (02/12/2011):
+version 0.3.0 (02/12/2011):
* new artwork
* source fix-up
* new method of getting streams
-version 0.1 (12/11/2010):
+version 0.1.0 (12/11/2010):
* initial release
diff --git a/plugin.video.tvvn/tvvn.py b/plugin.video.tvvn/tvvn.py
index 6865078..acf55c5 100644
--- a/plugin.video.tvvn/tvvn.py
+++ b/plugin.video.tvvn/tvvn.py
@@ -2,7 +2,7 @@
#---------------------------------------------------------------------
# File: tvvn.py
# By: Binh Nguyen <[email protected]>
-# Date: 25-07-2012
+# Date: 26-07-2012
#---------------------------------------------------------------------
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,63 +35,79 @@ fanart = xbmc.translatePath(os.path.join(home,
'fanart.jpg'))
# vtc.com.vn
# See here for more IP's http://www.vtc.com.vn/XMLStart.aspx
VTCURLList = ['rtmp://66.160.142.201/live',
- 'rtmp://66.160.142.198/live',
- 'rtmp://66.160.142.197/live']
+ 'rtmp://66.160.142.198/live',
+ 'rtmp://66.160.142.197/live']
VTCURL = choice(VTCURLList)
src_vtc = [VTCURL,
- 'http://vtc.com.vn/player.swf',
- 'http://vtc.com.vn/#',
- '']
+ 'http://vtc.com.vn/player.swf',
+ 'http://vtc.com.vn/#',
+ '']
# tv24.vn
TV24URLList = ['rtmp://112.197.2.16:1935/live',
- 'rtmp://112.197.2.11:1935/live']
+ 'rtmp://112.197.2.11:1935/live']
TV24URL = choice(TV24URLList)
src_tv24 = [TV24URL,
- 'http://tv24.vn/jwplayer/player.swf',
- 'http://www.tv24.vn',
- '']
+ 'http://tv24.vn/jwplayer/player.swf',
+ 'http://www.tv24.vn',
+ '']
# xunghe.vn
src_trt = ['rtmp://118.69.176.149/live',
- 'http://tv.xunghe.vn/player.swf',
-
'http://tv.xunghe.vn/?tab=Truyen-Hinh&xem=trt1-hue',
- '']
+ 'http://tv.xunghe.vn/player.swf',
+
'http://tv.xunghe.vn/?tab=Truyen-Hinh&xem=trt1-hue',
+ '']
# vietfacetv.com
VFTVURLList = ['rtmp://119.18.184.129:1935/streams',
- 'rtmp://64.71.151.49/streams']
+ 'rtmp://64.71.151.49/streams']
VFTVURL = choice(VFTVURLList)
src_vietface = [VFTVURL,
- 'http://vietpho.com/ext/js/playerPro.swf',
-
'http://vietpho.com/online-channels.php?id=42&gID=0&page=1',
- '']
+ 'http://vietpho.com/ext/js/playerPro.swf',
+
'http://vietpho.com/online-channels.php?id=42&gID=0&page=1',
+ '']
# van tv
src_vantv = ['rtmp://flash67.ustream.tv:1935/ustreamVideo/3097098',
-
'http://static-cdn1.ustream.tv/swf/live/viewer.rsl:194.swf',
- 'http://www.552vantv.com',
- '']
+
'http://static-cdn1.ustream.tv/swf/live/viewer.rsl:194.swf',
+ 'http://www.552vantv.com',
+ '']
+# little saigon tv
src_lsgtv = ['rtmp://stream.s15.cpanelservices.com/lstvlive',
-
'http://vietpho.com/ext/js/5.1/player-licensed.swf',
-
'http://vietpho.com/online-channels.php?id=2&gID=0&page=1',
- 'lstvlive']
+
'http://vietpho.com/ext/js/5.1/player-licensed.swf',
+
'http://vietpho.com/online-channels.php?id=2&gID=0&page=1',
+ 'lstvlive']
+# saigon tv
src_sgtv = ['rtmp://74.63.219.101:1935/sgtv',
- 'http://vietpho.com/ext/js/3/mediaplayer.swf',
-
'http://vietpho.com/online-channels.php?id=41&gID=0&page=1',
- 'sgtv']
+ 'http://vietpho.com/ext/js/3/mediaplayer.swf',
+
'http://vietpho.com/online-channels.php?id=41&gID=0&page=1',
+ 'sgtv']
+# global tv
src_globaltv = ['rtmp://unirtmp.tulix.tv:1935/globaltv',
- 'http://vietpho.com/ext/js/3/mediaplayer.swf',
-
'http://vietpho.com/online-channels.php?id=5&gID=0&page=1',
- 'globaltv']
+ 'http://vietpho.com/ext/js/3/mediaplayer.swf',
+
'http://vietpho.com/online-channels.php?id=5&gID=0&page=1',
+ 'globaltv']
+# vbs tv
src_vbstv = ['rtmp://74.63.219.101:1935/vbstele',
- 'http://vietpho.com/ext/js/3/mediaplayer.swf',
-
'http://vietpho.com/online-channels.php?id=6&gID=0&page=1',
- 'vbstele']
+ 'http://vietpho.com/ext/js/3/mediaplayer.swf',
+
'http://vietpho.com/online-channels.php?id=6&gID=0&page=1',
+ 'vbstele']
+
+# vpoptv
+src_vpoptv = ['rtmp://64.62.143.5/live',
+
'http://www.lihattv.com/scripts/videogallery.swf',
+ 'http://livetvstreaming.ucoz.com',
+ '']
+
+# lifetv
+src_lifetv = ['rtmp://video.lifetv.vn/live',
+
'http://www.lihattv.com/scripts/videogallery.swf',
+ 'http://livetvstreaming.ucoz.com',
+ '']
#---------------------------------------------------------------------
# CONFIGURATION ENDS
@@ -142,7 +158,9 @@ except:
def add_link(name,src,stream_name,ref,iconimage,desc):
ok = True
- short_name=name
+ short_name = name
+ if (iconimage == ''):
+ iconimage = 'default.png'
if (mysettings.getSetting('descriptions')=='true' and desc != ''):
if mysettings.getSetting('descriptions_on_right') == 'false':
name = desc+" "+name
@@ -156,6 +174,8 @@ def add_link(name,src,stream_name,ref,iconimage,desc):
def add_directory_link(name, lmode, iconimage,desc):
name = "["+name+"]"
+ if (iconimage == ''):
+ iconimage = 'default.png'
if (mysettings.getSetting('descriptions')=='true' and desc != ''):
if mysettings.getSetting('descriptions_on_right') == 'false':
name = desc+" "+name
@@ -189,21 +209,23 @@ def show_menu_sctv():
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_menu_local():
- add_link('HN1', 'src_tv24', 'hn1.stream', '', 'default.png', 'HÃ
Ná»i 1')
- add_link('TRT1', 'src_trt', 'trt', '', 'default.png', 'Thừa
Thiên Huế')
- add_link('LA34', 'src_tv24', 'la34.stream', '', 'default.png',
'Long An')
- add_link('THVL1', 'src_tv24', 'thvl1.stream', '', 'default.png',
'VÄ©nh Long')
- add_link('ÄN1', 'src_tv24', 'dn1.stream', '', 'default.png',
'Äá»ng Nai 1')
- add_link('HGV', 'src_tv24', 'thhg.stream', '', 'default.png',
'Háºu Giang')
- add_link('STV', 'src_tv24', 'thst.stream', '', 'default.png', 'Sóc
TrÄng')
- add_link('THTG', 'src_tv24', 'thtg.stream', '', 'default.png',
'Tiá»n Giang')
- add_link('QRT', 'src_tv24', 'qrt.stream', '', 'default.png',
'Quảng Nam')
- add_link('BTV', 'src_tv24', 'bthtv.stream', '', 'default.png',
'Bình Thuáºn')
- add_link('THÄT', 'src_tv24', 'thdt.stream', '', 'default.png',
'Äá»ng Tháp')
+ add_link('HTV7', 'src_tv24', 'htv7.stream', '', 'htv7.png', 'Thông
tin, Giải trÃ, Thá» thao')
+ add_link('HTV9', 'src_tv24', 'htv9.stream', '', 'htv9.png', 'ChÃnh
trá», Xã há»i, VÄn hóa')
+ add_link('HN1', 'src_tv24', 'hn1.stream', '', '', 'Hà Ná»i 1')
+ add_link('TRT1', 'src_trt', 'trt', '', '', 'Thừa Thiên Huế')
+ add_link('LA34', 'src_tv24', 'la34.stream', '', '', 'Long An')
+ add_link('THVL1', 'src_tv24', 'thvl1.stream', '', '', 'VÄ©nh Long')
+ add_link('ÄN1', 'src_tv24', 'dn1.stream', '', '', 'Äá»ng Nai 1')
+ add_link('HGV', 'src_tv24', 'thhg.stream', '', '', 'Háºu Giang')
+ add_link('STV', 'src_tv24', 'thst.stream', '', '', 'Sóc TrÄng')
+ add_link('THTG', 'src_tv24', 'thtg.stream', '', '', 'Tiá»n Giang')
+ add_link('QRT', 'src_tv24', 'qrt.stream', '', '', 'Quảng Nam')
+ add_link('BTV', 'src_tv24', 'bthtv.stream', '', '', 'Bình Thuáºn')
+ add_link('THÄT', 'src_tv24', 'thdt.stream', '', '', 'Äá»ng
Tháp')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_menu_overseas():
- add_link('Vietface', 'src_vietface',
'urlparams_qm_channel:1005_qm_token:6436488', '', 'vietfacetv.png',
'Vietface Media Group')
+ add_link('Vietface', 'src_vietface',
'urlparams_qm_channel:1005_qm_token:6436488_qm_video:L_qm_audio:L_qm_finished_gops:1',
'', 'vietfacetv.png', 'Vietface Media Group')
add_link('SaigonTV', 'src_sgtv', 'myStream.sdp', '',
'saigontv.png', 'Saigon TV')
add_link('GlobalTV', 'src_globaltv', 'myStream.sdp', '',
'globaltv.png', 'Global Television')
add_link('VAN-TV', 'src_vantv', 'streams/live_1', '', 'vantv.png',
'Vietnamese American Network TV')
@@ -219,12 +241,6 @@ def show_menu_vov():
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def Init():
- #add_link('VTV1', 'src_vtc', 'vtv11', 'VTV1/15', 'vtv1.png', 'Thông
tin tá»ng hợp')
- #add_link('VTV2', 'src_vtc', 'vtv2', 'VTV2/23', 'vtv2.png', 'Khoa
há»c & Giáo dục')
- #add_link('VTV3', 'src_vtc', 'vtv31', 'VTV3/3', 'vtv3.png', 'Thá»
thao, Giải trà & Thông tin kinh tế')
- #add_link('VTV4', 'src_vtc', 'vtv4', 'VTV4/2', 'vtv4.png', 'Kênh
cho ngÆ°á»i Viá»t Nam á» nÆ°á»c ngoà i')
- #add_link('HTV7', 'src_vtc', 'htv7', '', 'htv7.png', 'Thông tin -
Giải trà - ThỠthao')
- #add_link('HTV9', 'src_vtc', 'htv91', '', 'htv9.png', 'ChÃnh trá»
- Xã há»i - VÄn hóa')
add_link('VTV1', 'src_tv24', 'vtv1.stream', '', 'vtv1.png', 'Thông
tin tá»ng hợp')
add_link('VTV2', 'src_tv24', 'vtv2.stream', '', 'vtv2.png', 'Khoa
há»c, Giáo dục')
add_link('VTV3', 'src_tv24', 'vtv3.stream', '', 'vtv3.png', 'Thá»
thao, Giải trÃ, Thông tin Kinh tế')
@@ -232,15 +248,15 @@ def Init():
add_link('VTV6', 'src_tv24', 'vtv6.stream', '', 'vtv6.png', 'Kênh
cho Thanh, thiếu niên')
add_link('VTV9', 'src_tv24', 'vtv9.stream', '', 'vtv9.png', 'Kênh
cho Khán giả miá»n Nam')
add_link('ANTV', 'src_tv24', 'antv.stream', '', 'antv.png', 'An ninh
TV')
- add_link('HTV7', 'src_tv24', 'htv7.stream', '', 'htv7.png', 'Thông
tin, Giải trÃ, Thá» thao')
- add_link('HTV9', 'src_tv24', 'htv9.stream', '', 'htv9.png', 'ChÃnh
trá», Xã há»i, VÄn hóa')
+ add_link('VpopTV', 'src_vpoptv', 'Stream33', '', 'vpoptv.png', 'Kênh
âm nhạc Äặc sắc')
+ add_link('lifetv', 'src_lifetv', 'Stream1', '', 'lifetv.png', 'Lá»i
sá»ng và sức khá»e')
add_link('VTC1', 'src_vtc', 'vtc11', 'VTC1/10', 'vtc1.png', 'Thá»i
sá»± tá»ng hợp')
add_link('VTC2', 'src_vtc', 'vtc21', 'VTC2/11', 'vtc2.png', 'Khoa
há»c, Công nghá»')
add_link('VTC10', 'src_vtc', 'vtc101', 'VTC10/22', 'vtc10.png', 'Kênh
VÄn hóa Viá»t')
add_directory_link('SCTV Channels', '10', 'sctv.png', 'SCTV hợp tác
và sản xuất')
add_directory_link('VOV Radio', '11', 'vov.png', 'Äà i Tiếng nói
Viá»t Nam')
- add_directory_link('Local Stations', '12', 'default.png', 'Truyá»n
hình Äá»a phÆ°Æ¡ng')
- add_directory_link('Oversea Stations', '13', 'default.png', 'Truyá»n
hình Hải ngoại')
+ add_directory_link('Local Stations', '12', '', 'Truyá»n hình Äá»a
phÆ°Æ¡ng')
+ add_directory_link('Oversea Stations', '13', '', 'Truyá»n hình Hải
ngoại')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0f4eabcba2f119f4e62854a6e006360f8d78f4d7
-----------------------------------------------------------------------
Summary of changes:
plugin.video.4players/addon.py | 7 +-
plugin.video.4players/addon.xml | 3 +-
plugin.video.4players/changelog.txt | 6 +
.../resources/language/English/strings.xml | 12 +-
.../resources/language/German/strings.xml | 12 +-
plugin.video.4players/resources/lib/scraper.py | 19 +--
plugin.video.dr.dk.live/addon.py | 8 +-
plugin.video.dr.dk.live/addon.xml | 2 +-
plugin.video.dr.dk.live/changelog.txt | 6 +
plugin.video.dr.dk.live/channels.py | 30 +++--
plugin.video.manoto/.gitattributes | 7 +
.../LICENSE.txt | 0
.../addon.xml | 12 +-
plugin.video.manoto/default.py | 131 ++++++++++++++++++++
plugin.video.manoto/icon.png | Bin 0 -> 7252 bytes
.../resources/language/English/strings.xml | 2 -
plugin.video.manoto/resources/settings.xml | 4 +
plugin.video.svtplay/addon.xml | 3 +-
plugin.video.svtplay/changelog.txt | 4 +
plugin.video.svtplay/default.py | 2 +-
plugin.video.tvvn/README | 2 +-
plugin.video.tvvn/addon.xml | 6 +-
plugin.video.tvvn/antv.png | Bin 20708 -> 0 bytes
plugin.video.tvvn/changelog.txt | 17 ++-
plugin.video.tvvn/htv7.png | Bin 50997 -> 0 bytes
plugin.video.tvvn/htv9.png | Bin 54103 -> 0 bytes
plugin.video.tvvn/resources/logos/lifetv.png | Bin 0 -> 53751 bytes
plugin.video.tvvn/resources/logos/vpoptv.png | Bin 0 -> 34989 bytes
plugin.video.tvvn/sctv.png | Bin 49620 -> 0 bytes
plugin.video.tvvn/tvvn.py | 126 +++++++++++--------
plugin.video.tvvn/vov.png | Bin 44755 -> 0 bytes
plugin.video.tvvn/vov1.png | Bin 47619 -> 0 bytes
plugin.video.tvvn/vov2.png | Bin 51085 -> 0 bytes
plugin.video.tvvn/vov3.png | Bin 52433 -> 0 bytes
plugin.video.tvvn/vov5.png | Bin 51335 -> 0 bytes
plugin.video.tvvn/vtc1.png | Bin 34911 -> 0 bytes
plugin.video.tvvn/vtc10.png | Bin 36583 -> 0 bytes
plugin.video.tvvn/vtc2.png | Bin 35978 -> 0 bytes
plugin.video.tvvn/vtv1.png | Bin 26245 -> 0 bytes
plugin.video.tvvn/vtv2.png | Bin 29997 -> 0 bytes
plugin.video.tvvn/vtv3.png | Bin 34141 -> 0 bytes
plugin.video.tvvn/vtv4.png | Bin 30738 -> 0 bytes
plugin.video.tvvn/vtv6.png | Bin 39417 -> 0 bytes
plugin.video.tvvn/vtv9.png | Bin 31636 -> 0 bytes
44 files changed, 300 insertions(+), 121 deletions(-)
create mode 100644 plugin.video.manoto/.gitattributes
copy {plugin.audio.abradio.cz => plugin.video.manoto}/LICENSE.txt (100%)
copy {plugin.video.glwiz => plugin.video.manoto}/addon.xml (67%)
create mode 100644 plugin.video.manoto/default.py
create mode 100644 plugin.video.manoto/icon.png
copy {plugin.video.glwiz =>
plugin.video.manoto}/resources/language/English/strings.xml (72%)
create mode 100644 plugin.video.manoto/resources/settings.xml
delete mode 100644 plugin.video.tvvn/antv.png
delete mode 100644 plugin.video.tvvn/htv7.png
delete mode 100644 plugin.video.tvvn/htv9.png
create mode 100644 plugin.video.tvvn/resources/logos/lifetv.png
create mode 100644 plugin.video.tvvn/resources/logos/vpoptv.png
delete mode 100644 plugin.video.tvvn/sctv.png
delete mode 100644 plugin.video.tvvn/vov.png
delete mode 100644 plugin.video.tvvn/vov1.png
delete mode 100644 plugin.video.tvvn/vov2.png
delete mode 100644 plugin.video.tvvn/vov3.png
delete mode 100644 plugin.video.tvvn/vov5.png
delete mode 100644 plugin.video.tvvn/vtc1.png
delete mode 100644 plugin.video.tvvn/vtc10.png
delete mode 100644 plugin.video.tvvn/vtc2.png
delete mode 100644 plugin.video.tvvn/vtv1.png
delete mode 100644 plugin.video.tvvn/vtv2.png
delete mode 100644 plugin.video.tvvn/vtv3.png
delete mode 100644 plugin.video.tvvn/vtv4.png
delete mode 100644 plugin.video.tvvn/vtv6.png
delete mode 100644 plugin.video.tvvn/vtv9.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
