The branch, eden has been updated
via 1ac55986eb2ebf3a61632e84952111693f525eec (commit)
via d65e2d5152e6f74783ac964920b5e159992ab250 (commit)
from 47e4558e3c9b06767209a7e1b7f22aaaebd8a529 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1ac55986eb2ebf3a61632e84952111693f525eec
commit 1ac55986eb2ebf3a61632e84952111693f525eec
Author: Martijn Kaijser <[email protected]>
Date: Wed Jul 25 21:13:39 2012 +0200
[plugin.video.tvvn] -v0.8.0
diff --git a/plugin.video.tvvn/README b/plugin.video.tvvn/README
index f2ae4c6..ef2d809 100644
--- a/plugin.video.tvvn/README
+++ b/plugin.video.tvvn/README
@@ -1,5 +1,11 @@
This plugin allows you to watch live TV channels or listen to radio stations
-in Viet Nam straight from the XBMC interface, eliminates the needs for using
-browsers and flashplayer, etc.
+in Viet Nam or from oversea providers straight from the XBMC interface,
+eliminates the needs for using browsers and flashplayer, etc.
-All contents are pulled from vtc.com.vn and tv24.com.vn.
+DISCLAIMER: 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 :)
+
+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
diff --git a/plugin.video.tvvn/addon.xml b/plugin.video.tvvn/addon.xml
index 817f42a..c937a85 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.7.2"
+ version="0.8"
name="TV Viet Nam"
provider-name="Binh Nguyen">
<requires>
@@ -15,9 +15,9 @@
<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. Report bugs at:
zecoj.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. Vui lòng báo lá»i nếu
gặp tại: zecoj.com</description>
- <disclaimer lang="en">all live streams are pulled from
vtc.com.vn and tv24.com.vn</disclaimer>
- <disclaimer lang="vi">tất cả các live streams Äược
lấy từ vtc.com.vn và tv24.com.vn</disclaimer>
+ <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>
+ <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>
</addon>
diff --git a/plugin.video.tvvn/changelog.txt b/plugin.video.tvvn/changelog.txt
index 72ff751..55ab21a 100644
--- a/plugin.video.tvvn/changelog.txt
+++ b/plugin.video.tvvn/changelog.txt
@@ -1,3 +1,9 @@
+version 0.8 (25/07/2012):
+ * adding more oversea channels
+ * update disclaimer
+ * improvements and bug fixes
+ * code clean up
+
version 0.7.2 (07/05/2012):
* show channel's name on "Information screen" during playback
* the following options are now available under "Add-on settings"
diff --git a/plugin.video.tvvn/tvvn.py b/plugin.video.tvvn/tvvn.py
index 60fc912..6865078 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-03-2012
+# Date: 25-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
@@ -19,6 +19,7 @@
#---------------------------------------------------------------------
import os, re, sys, urllib, urllib2, xbmcaddon, xbmcplugin, xbmcgui
+from random import choice
addon = xbmcaddon.Addon('plugin.video.tvvn')
profile = xbmc.translatePath(addon.getAddonInfo('profile'))
@@ -29,33 +30,68 @@ fanart = xbmc.translatePath(os.path.join(home,
'fanart.jpg'))
#---------------------------------------------------------------------
# CONFIGURATION STARTS
#---------------------------------------------------------------------
-# src_name = [stream url, swf player url, referrer url]
+# src_name = [stream url, swf player url, referrer url, app name]
# 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']
-from random import choice
-VTCURL=choice(VTCURLList)
-
-src_vtc = [VTCURL,
- 'http://vtc.com.vn/player.swf',
- 'http://vtc.com.vn/#']
+VTCURLList = ['rtmp://66.160.142.201/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/#',
+ '']
# tv24.vn
-TV24URLList=['rtmp://112.197.2.16: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']
+TV24URLList = ['rtmp://112.197.2.16: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',
+ '']
# 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']
+src_trt = ['rtmp://118.69.176.149/live',
+ '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']
+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',
+ '']
+
+# 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',
+ '']
+
+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']
+
+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']
+
+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']
+
+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']
#---------------------------------------------------------------------
# CONFIGURATION ENDS
@@ -113,7 +149,7 @@ def add_link(name,src,stream_name,ref,iconimage,desc):
else:
name = name+" "+desc
give_url =
sys.argv[0]+"?mode=1&stream_name="+stream_name+"&ref="+ref+"&src="+src+"&stream_short_name="+short_name
- liz = xbmcgui.ListItem( name,
iconImage=xbmc.translatePath(os.path.join(home, iconimage)),
thumbnailImage=xbmc.translatePath(os.path.join(home, iconimage)))
+ liz = xbmcgui.ListItem( name,
iconImage=xbmc.translatePath(os.path.join(home, 'resources', 'logos',
iconimage)), thumbnailImage=xbmc.translatePath(os.path.join(home, 'resources',
'logos', iconimage)))
liz.setInfo(type="Video", infoLabels={"Title": name})
liz.setProperty("Fanart_Image",fanart)
ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=give_url,listitem=liz)
@@ -125,7 +161,7 @@ def add_directory_link(name, lmode, iconimage,desc):
name = desc+" "+name
else:
name = name+" "+desc
- li = xbmcgui.ListItem( name,
iconImage=xbmc.translatePath(os.path.join(home, iconimage)),
thumbnailImage=xbmc.translatePath(os.path.join(home, iconimage)))
+ li = xbmcgui.ListItem( name,
iconImage=xbmc.translatePath(os.path.join(home, 'resources', 'logos',
iconimage)), thumbnailImage=xbmc.translatePath(os.path.join(home, 'resources',
'logos', iconimage)))
li.setInfo(type="Video", infoLabels={"Title": name})
li.setProperty("Fanart_Image",fanart)
url = sys.argv[0]+'?mode='+lmode
@@ -153,19 +189,28 @@ def show_menu_sctv():
xbmcplugin.endOfDirectory(int(sys.argv[1]))
def show_menu_local():
- 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')
+ 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')
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('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')
+ add_link('VBSTV', 'src_vbstv', 'myStream.sdp', '', 'vbstv.png',
'Vietnamese Broadcasting Services')
+ add_link('LSTV', 'src_lsgtv', 'livestream', '', 'lsaigontv.png',
'Little Saigon TV')
+ xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
def show_menu_vov():
add_link('VOV1', 'src_vtc', 'vov1', 'VOV1/29', 'vov1.png', 'Thá»i
sá»±, ChÃnh trá», Tá»ng hợp')
add_link('VOV2', 'src_vtc', 'vov2', 'VOV2/28', 'vov2.png', 'VÄn
hóa, Äá»i sá»ng, Khoa giáo')
@@ -193,8 +238,9 @@ def Init():
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('Local Stations', '12', 'vov.png', 'Truyá»n hình
Äá»a phÆ°Æ¡ng')
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')
xbmcplugin.endOfDirectory(int(sys.argv[1]))
@@ -202,12 +248,23 @@ def play_video(src, name, stream_name, ref):
prov = globals()[src]
item = xbmcgui.ListItem(name)
- pageUrl=prov[2]+"/"+ref
- videoUrl=prov[0]+"/"+stream_name
+ stream_name=stream_name.replace('_qm_','?')
+
+ if (ref != ''):
+ pageUrl=prov[2]+"/"+ref
+ else:
+ pageUrl=prov[2]
+
+ if (stream_name != ''):
+ videoUrl=prov[0]+"/"+stream_name
+ else:
+ videoUrl=prov[0]
swfUrl=prov[1]
flashVer='LNX_11,2,202,233'
- fullURL=videoUrl+' swfVfy=1 live=1 playpath='+stream_name+'
flashVer='+flashVer+' app=live pageUrl='+pageUrl+'/ tcUrl='+videoUrl+'
swfUrl='+swfUrl
+ fullURL=videoUrl+' swfVfy=1 live=1 playpath='+stream_name+'
flashVer='+flashVer+' pageUrl='+pageUrl+' tcUrl='+videoUrl+' swfUrl='+swfUrl
+ if (prov[3] != ''):
+ fullURL=fullURL+' app='+prov[3]
if (src == "src_tv24" and mysettings.getSetting('tv24_http') == 'true'):
fullURL=prov[0].replace("rtmp://","http://";)+"/"+stream_name+"/playlist.m3u8"
xbmc.Player(xbmc.PLAYER_CORE_DVDPLAYER).play(fullURL, item)
@@ -222,3 +279,5 @@ elif mode==11:
show_menu_vov()
elif mode==12:
show_menu_local()
+elif mode==13:
+ show_menu_overseas()
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d65e2d5152e6f74783ac964920b5e159992ab250
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.dradio/.gitignore | 1 +
.../LICENSE.txt | 0
plugin.audio.dradio/addon.xml | 22 +++
plugin.audio.dradio/default.py | 161 ++++++++++++++++++++
plugin.audio.dradio/icon.png | Bin 0 -> 22490 bytes
plugin.video.tvvn/README | 12 +-
plugin.video.tvvn/addon.xml | 10 +-
plugin.video.tvvn/changelog.txt | 6 +
plugin.video.tvvn/{ => resources/logos}/antv.png | Bin 20708 -> 20708 bytes
plugin.video.tvvn/resources/logos/default.png | Bin 0 -> 66927 bytes
plugin.video.tvvn/resources/logos/globaltv.png | Bin 0 -> 38059 bytes
plugin.video.tvvn/{ => resources/logos}/htv7.png | Bin 50997 -> 50997 bytes
plugin.video.tvvn/{ => resources/logos}/htv9.png | Bin 54103 -> 54103 bytes
plugin.video.tvvn/resources/logos/lsaigontv.png | Bin 0 -> 65251 bytes
plugin.video.tvvn/resources/logos/saigontv.png | Bin 0 -> 41666 bytes
plugin.video.tvvn/{ => resources/logos}/sctv.png | Bin 49620 -> 49620 bytes
plugin.video.tvvn/resources/logos/vantv.png | Bin 0 -> 124725 bytes
plugin.video.tvvn/resources/logos/vbstv.png | Bin 0 -> 62570 bytes
plugin.video.tvvn/resources/logos/vietfacetv.png | Bin 0 -> 72829 bytes
plugin.video.tvvn/{ => resources/logos}/vov.png | Bin 44755 -> 44755 bytes
plugin.video.tvvn/{ => resources/logos}/vov1.png | Bin 47619 -> 47619 bytes
plugin.video.tvvn/{ => resources/logos}/vov2.png | Bin 51085 -> 51085 bytes
plugin.video.tvvn/{ => resources/logos}/vov3.png | Bin 52433 -> 52433 bytes
plugin.video.tvvn/{ => resources/logos}/vov5.png | Bin 51335 -> 51335 bytes
plugin.video.tvvn/{ => resources/logos}/vtc1.png | Bin 34911 -> 34911 bytes
plugin.video.tvvn/{ => resources/logos}/vtc10.png | Bin 36583 -> 36583 bytes
plugin.video.tvvn/{ => resources/logos}/vtc2.png | Bin 35978 -> 35978 bytes
plugin.video.tvvn/{ => resources/logos}/vtv1.png | Bin 26245 -> 26245 bytes
plugin.video.tvvn/{ => resources/logos}/vtv2.png | Bin 29997 -> 29997 bytes
plugin.video.tvvn/{ => resources/logos}/vtv3.png | Bin 34141 -> 34141 bytes
plugin.video.tvvn/{ => resources/logos}/vtv4.png | Bin 30738 -> 30738 bytes
plugin.video.tvvn/{ => resources/logos}/vtv6.png | Bin 39417 -> 39417 bytes
plugin.video.tvvn/{ => resources/logos}/vtv9.png | Bin 31636 -> 31636 bytes
plugin.video.tvvn/tvvn.py | 137 ++++++++++++-----
34 files changed, 302 insertions(+), 47 deletions(-)
create mode 100644 plugin.audio.dradio/.gitignore
copy {plugin.audio.groove => plugin.audio.dradio}/LICENSE.txt (100%)
create mode 100644 plugin.audio.dradio/addon.xml
create mode 100644 plugin.audio.dradio/default.py
create mode 100644 plugin.audio.dradio/icon.png
copy plugin.video.tvvn/{ => resources/logos}/antv.png (100%)
create mode 100644 plugin.video.tvvn/resources/logos/default.png
create mode 100644 plugin.video.tvvn/resources/logos/globaltv.png
copy plugin.video.tvvn/{ => resources/logos}/htv7.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/htv9.png (100%)
create mode 100644 plugin.video.tvvn/resources/logos/lsaigontv.png
create mode 100644 plugin.video.tvvn/resources/logos/saigontv.png
copy plugin.video.tvvn/{ => resources/logos}/sctv.png (100%)
create mode 100644 plugin.video.tvvn/resources/logos/vantv.png
create mode 100644 plugin.video.tvvn/resources/logos/vbstv.png
create mode 100644 plugin.video.tvvn/resources/logos/vietfacetv.png
copy plugin.video.tvvn/{ => resources/logos}/vov.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vov1.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vov2.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vov3.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vov5.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtc1.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtc10.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtc2.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv1.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv2.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv3.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv4.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv6.png (100%)
copy plugin.video.tvvn/{ => resources/logos}/vtv9.png (100%)
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
