Merge pull request #42 from zynine-/zynine-pms1.4.1-patch

0.9.13 (2017-02-15)

Author: zynine-

CHANGELOG.md

@@ -1,3 +1,6 @@
+##0.9.13 (2017-02-15)
+- PMS 1.4.1.3362 Fix.
+
 ##0.9.12 (2016-11-07)
 - Potential fix for HDHomeRun Prime + Roku 7.5.
 

Contents/Code/__init__.py

@@ -1,4 +1,4 @@
-# HDHR Viewer V2 v0.9.11
+# HDHR Viewer V2 v0.9.13
 
 import time
 import string
@@ -8,9 +8,9 @@
 from lxml import etree
 
 DEBUGMODE            = True
-TITLE                = 'HDHR Viewer 2 (0.9.12)'
+TITLE                = 'HDHR Viewer 2 (0.9.13)'
 PREFIX               = '/video/hdhrv2'
-VERSION              = '0.9.12'
+VERSION              = '0.9.13'
 
 
 #GRAPHICS
@@ -916,15 +916,15 @@ def AddChannelObjectContainer(oc, tuneridx, title, channels, search=False):
 # This function is taken straight (well, almost) from the HDHRViewer V1 codebase
 ###################################################################################################
 @route(PREFIX + '/CreateVO')
-def CreateVO(tuneridx, url, title, year=None, tagline='', summary='', thumb=R(ICON_DEFAULT_CHANNEL), starRating=0, include_container=False, checkFiles=0, videoCodec='mpeg2video',audioCodec='ac3',transcode='default'):
+def CreateVO(tuneridx, url, title, year=None, tagline='', summary='', thumb=R(ICON_DEFAULT_CHANNEL), starRating=0, include_container=False, checkFiles=0, videoCodec='mpeg2video',audioCodec='ac3',transcode='default',includeBandwidths=1):
 
     uniquekey = str(tuneridx)+url
 
     if transcode=='auto':
         #AUTO TRANSCODE
         vo = VideoClipObject(
             rating_key = uniquekey,
-            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec,audioCodec=audioCodec,transcode=transcode),
+            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec,audioCodec=audioCodec,transcode=transcode,includeBandwidths=includeBandwidths),
             rating = float(starRating),
             title = xstr(title),
             year = xint(year),
@@ -981,7 +981,7 @@ def CreateVO(tuneridx, url, title, year=None, tagline='', summary='', thumb=R(IC
     elif transcode=='default':
         vo = VideoClipObject(
             rating_key = uniquekey,
-            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec, audioCodec=audioCodec, transcode=transcode),
+            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec, audioCodec=audioCodec, transcode=transcode,includeBandwidths=includeBandwidths),
             rating = float(starRating),
             title = xstr(title),
             year = xint(year),
@@ -1007,7 +1007,7 @@ def CreateVO(tuneridx, url, title, year=None, tagline='', summary='', thumb=R(IC
     else:
         vo = VideoClipObject(
             rating_key = uniquekey,
-            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec, audioCodec=audioCodec, transcode=transcode),
+            key = Callback(CreateVO, tuneridx=tuneridx, url=url, title=title, year=year, tagline=tagline, summary=summary, thumb=thumb, starRating=starRating, include_container=True, checkFiles=checkFiles, videoCodec=videoCodec, audioCodec=audioCodec, transcode=transcode,includeBandwidths=includeBandwidths),
             rating = float(starRating),
             title = xstr(title),
             year = xint(year),