diff --git a/plugin/controllers/ajax.py b/plugin/controllers/ajax.py index 1a60d78..4db8c5c 100644 --- a/plugin/controllers/ajax.py +++ b/plugin/controllers/ajax.py @@ -123,6 +123,11 @@ class AjaxController(BaseController): movies = getMovieList(request.args["dirname"][0]) else: movies = getMovieList() + info = getInfo() + model = info["model"] + movies['transcoding'] = False + if model in ("solo2", "duo2"): + movies['transcoding'] = True return movies def P_workinprogress(self, request): diff --git a/plugin/controllers/models/stream.py b/plugin/controllers/models/stream.py index de2f6ed..2311c5b 100644 --- a/plugin/controllers/models/stream.py +++ b/plugin/controllers/models/stream.py @@ -73,7 +73,14 @@ def getTS(self,request): else: progopt="" - response = "#EXTM3U\n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/file?file=%s\n" % (progopt,request.getRequestHostname(), config.OpenWebif.port.value, quote(filename)) + portNumber = config.OpenWebif.port.value + info = getInfo() + model = info["model"] + if model in ("solo2","duo2"): + if "device" in request.args : + if request.args["device"][0] == "phone" : + portNumber = 8003; + response = "#EXTM3U\n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/file?file=%s\n" % (progopt,request.getRequestHostname(), portNumber, quote(filename)) request.setHeader('Content-Type', 'application/text') return response else: diff --git a/plugin/controllers/views/ajax/movies.tmpl b/plugin/controllers/views/ajax/movies.tmpl index 6b0670c..7a026cf 100755 --- a/plugin/controllers/views/ajax/movies.tmpl +++ b/plugin/controllers/views/ajax/movies.tmpl @@ -49,19 +49,28 @@ #end if -
+ #set $count += 1 @@ -72,4 +81,4 @@ \ No newline at end of file + diff --git a/plugin/controllers/views/main.tmpl b/plugin/controllers/views/main.tmpl index 760bab8..fc217a7 100755 --- a/plugin/controllers/views/main.tmpl +++ b/plugin/controllers/views/main.tmpl @@ -202,5 +202,9 @@ +