1 diff --git a/plugin/controllers/ajax.py b/plugin/controllers/ajax.py
2 index 1a60d78..4db8c5c 100644
3 --- a/plugin/controllers/ajax.py
4 +++ b/plugin/controllers/ajax.py
5 @@ -123,6 +123,11 @@ class AjaxController(BaseController):
6 movies = getMovieList(request.args["dirname"][0])
8 movies = getMovieList()
10 + model = info["model"]
11 + movies['transcoding'] = False
12 + if model in ("solo2", "duo2"):
13 + movies['transcoding'] = True
16 def P_workinprogress(self, request):
17 diff --git a/plugin/controllers/models/stream.py b/plugin/controllers/models/stream.py
18 index de2f6ed..2311c5b 100644
19 --- a/plugin/controllers/models/stream.py
20 +++ b/plugin/controllers/models/stream.py
21 @@ -73,7 +73,14 @@ def getTS(self,request):
25 - response = "#EXTM3U\n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/file?file=%s\n" % (progopt,request.getRequestHostname(), config.OpenWebif.port.value, quote(filename))
26 + portNumber = config.OpenWebif.port.value
28 + model = info["model"]
29 + if model in ("solo2","duo2"):
30 + if "device" in request.args :
31 + if request.args["device"][0] == "phone" :
33 + response = "#EXTM3U\n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/file?file=%s\n" % (progopt,request.getRequestHostname(), portNumber, quote(filename))
34 request.setHeader('Content-Type', 'application/text')
37 diff --git a/plugin/controllers/views/ajax/movies.tmpl b/plugin/controllers/views/ajax/movies.tmpl
38 index 6b0670c..7a026cf 100755
39 --- a/plugin/controllers/views/ajax/movies.tmpl
40 +++ b/plugin/controllers/views/ajax/movies.tmpl
45 - <div class="moviecontainer_right">
\r
46 - <div style="padding: 3px; text-align: right;">
\r
47 - <a target="_blank" href='/web/ts.m3u?file=$quote($movie.filename)'>
\r
48 - <img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
\r
50 - <a href='/file?action=download&file=$quote($movie.filename)'>
\r
51 - <img align="top" src="../images/ico_download.png" title="Download $movie.eventname" border="0">
\r
53 - <a href='#' onClick="deleteMovie('$quote($movie.serviceref)', '$count'); return false;">
\r
54 - <img src="../images/ico_delete.png" title="Delete Movie" border="0"></a>
\r
58 + <div class="moviecontainer_right">
\r
59 + <div style="padding: 3px; text-align: right;">
\r
61 + <a href="#" onclick="jumper80('$quote($movie.filename)');">
\r
62 + <img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
\r
64 + <a href="#" onclick="jumper8003('$quote($movie.filename)');">
\r
65 + <img align="top" src="../images/ico_stream.png" title="Stream(8003) $movie.eventname" border="0">
\r
68 + <a target="_blank" href='/web/ts.m3u?file=$quote($movie.filename)'>
\r
69 + <img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
\r
72 + <a href='/file?action=download&file=$quote($movie.filename)'>
\r
73 + <img align="top" src="../images/ico_download.png" title="Download $movie.eventname" border="0">
\r
75 + <a href='#' onClick="deleteMovie('$quote($movie.serviceref)', '$count'); return false;">
\r
76 + <img src="../images/ico_delete.png" title="Delete Movie" border="0"></a>
\r
80 <div style="clear: both;"></div>
\r
85 <script type="text/javascript">
\r
86 \$('#moviebuttons').buttonset();
\r
88 \ No newline at end of file
90 diff --git a/plugin/controllers/views/main.tmpl b/plugin/controllers/views/main.tmpl
91 index 760bab8..fc217a7 100755
92 --- a/plugin/controllers/views/main.tmpl
93 +++ b/plugin/controllers/views/main.tmpl
95 <input type="hidden" name="name">
\r
96 <input type="hidden" name="device">
\r
98 + <form name="portFormTs" action="/web/ts.m3u" method="GET" target="_blank">
\r
99 + <input type="hidden" name="file">
\r
100 + <input type="hidden" name="device">
\r
104 diff --git a/plugin/public/js/transcoding.js b/plugin/public/js/transcoding.js
105 index 8729835..785a4b7 100644
106 --- a/plugin/public/js/transcoding.js
107 +++ b/plugin/public/js/transcoding.js
108 @@ -41,6 +41,20 @@ function getOSType() {
112 +function jumper80( file ) {
113 + var deviceType = getDeviceType();
114 + document.portFormTs.file.value = file;
115 + document.portFormTs.device.value = "etc";
116 + document.portFormTs.submit();
119 +function jumper8003( file ) {
120 + var deviceType = getDeviceType();
121 + document.portFormTs.file.value = file;
122 + document.portFormTs.device.value = "phone";
123 + document.portFormTs.submit();
126 function jumper8002( sref, sname ) {
127 var deviceType = getDeviceType();
128 document.portForm.ref.value = sref;