The branch, frodo has been updated
via 7265822e1dd83c2dab648672373e8d5cc6fd030a (commit)
from 97d3ff9809d4f70669d829813776d3016d8a2624 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7265822e1dd83c2dab648672373e8d5cc6fd030a
commit 7265822e1dd83c2dab648672373e8d5cc6fd030a
Author: beenje <[email protected]>
Date: Thu Jan 10 21:56:30 2013 +0100
[plugin.video.filmon] updated to version 4.2.5
diff --git a/plugin.video.filmon/addon.xml b/plugin.video.filmon/addon.xml
index 201a14f..3e36424 100644
--- a/plugin.video.filmon/addon.xml
+++ b/plugin.video.filmon/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.filmon" name="FilmOn" version="3.2.3"
provider-name="FilmOn.TV Networks Inc">
+<addon id="plugin.video.filmon" name="FilmOn" version="4.2.5"
provider-name="FilmOn.TV Networks Inc">
<requires>
- <import addon="xbmc.python" version="2.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.t0mm0.common" version="1.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
diff --git a/plugin.video.filmon/changelog.txt
b/plugin.video.filmon/changelog.txt
index 7e711a2..9cb0bf1 100644
--- a/plugin.video.filmon/changelog.txt
+++ b/plugin.video.filmon/changelog.txt
@@ -1,3 +1,10 @@
+v4.2.5
+Fixed Local Channels
+Frodo Compatible
+
+v3.2.4
+Fixed Local Channels
+
v3.2.3
Fixed Added Favourites
@@ -113,4 +120,4 @@ v1.1
Added High Strem Too
v1.0
-Initial Release
\ No newline at end of file
+Initial Release
diff --git a/plugin.video.filmon/default.py b/plugin.video.filmon/default.py
index ae91b29..8bbe251 100644
--- a/plugin.video.filmon/default.py
+++ b/plugin.video.filmon/default.py
@@ -204,18 +204,20 @@ def CHANNELS(name,url):
def GET_STREAM_RESOLUTION(channels,resolution,watch_timeout):
+ print channels
watch_timeout=str(watch_timeout)
if resolution == '0':
quality = 'LOW'
-
+ if not 'low' in channels:
+ quality = 'HIGH'
if resolution == '1':
quality = 'HIGH'
-
if resolution == '2':
quality = 'LOW'
if len(watch_timeout)>5:
quality = 'HIGH'
-
+ if not 'low' in channels:
+ quality = 'HIGH'
for item in channels:
if item['quality'].upper() == quality:
return item
@@ -233,18 +235,31 @@ def GET_STREAMS(url):
foregex= stream['url']+'<'
playpath=stream['name']
name=stream['quality']
- if re.search('mp4:bc', link, re.IGNORECASE):
+ try:
regex = re.compile('rtmp://(.+?)/(.+?)/<')
match = regex.search(foregex)
app = '%s/' %(match.group(2))
url= stream['url']+playpath
- if not re.search('mp4:bc', link, re.IGNORECASE):
+ swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
+ except:
+ pass
+ try:
regex =
re.compile('rtmp://(.+?)/(.+?)/(.+?)id=([a-f0-9]*?)<')
match = regex.search(foregex)
app = '%s/%sid=%s' %(match.group(2),
match.group(3),match.group(4))
url= stream['url']
+ swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
+ except:
+ pass
+ try:
+ regex = re.compile('rtmp://(.+?)/(.+?)id=(.+?)"')
+ match1 = regex.search(foregex)
+ app = '%sid=%s' %(match1.group(2), match1.group(3))
+ url= stream['url']+playpath
+
swfUrl='http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf?v=28'
+ except:
+ pass
tcUrl=stream['url']
- swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
pageUrl = 'http://www.filmon.com/'
url= str(url)+' playpath='+str(playpath)+' app='+str(app)+'
swfUrl='+str(swfUrl)+' tcUrl='+str(tcUrl)+' pageurl='+str(pageUrl)
return url
-----------------------------------------------------------------------
Summary of changes:
plugin.video.filmon/addon.xml | 4 ++--
plugin.video.filmon/changelog.txt | 9 ++++++++-
plugin.video.filmon/default.py | 27 +++++++++++++++++++++------
3 files changed, 31 insertions(+), 9 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
