X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Fe2openplugins%2Fenigma2-plugin-extensions-openwebif%2Fopenwebif_8001_8002.patch;fp=meta-openvuplus%2Frecipes-vuplus%2Fe2openplugins%2Fenigma2-plugin-extensions-openwebif%2Fopenwebif_8001_8002.patch;h=3806e974ea9395d197203413d9c503decca2fa32;hb=9127dbed235b4892155fd15bcd8cbbaf070ccf97;hp=909a9ae7a912b7f35628eb32a0d4e01cb0ae7f36;hpb=354499adf657b33f8001e9875a94113c8b036e09;p=vuplus_openvuplus_3.0
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif/openwebif_8001_8002.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif/openwebif_8001_8002.patch
index 909a9ae..3806e97 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif/openwebif_8001_8002.patch
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif/openwebif_8001_8002.patch
@@ -1,66 +1,57 @@
diff --git a/plugin/controllers/models/stream.py b/plugin/controllers/models/stream.py
-index fe4ddd4..71b1eaa 100644
+index c42ba76..4380052 100644
--- a/plugin/controllers/models/stream.py
+++ b/plugin/controllers/models/stream.py
-@@ -25,11 +25,21 @@ def getStream(session, request, m3ufile):
+@@ -38,11 +38,16 @@ def getStream(session, request, m3ufile):
if "name" in request.args:
name = request.args["name"][0]
# #EXTINF:-1,%s\n remove not compatiple with old api
-- if sRef != '':
-+
++ portNumber = 8001
+ if "device" in request.args :
+ if request.args["device"][0] == "phone" :
+ portNumber = 8002;
-+ else :
-+ portNumber = config.OpenWebif.streamport.value
-+ else :
-+ portNumber = config.OpenWebif.streamport.value
-+
-+ if sRef != '' :
+ if sRef != '':
progopt="#EXTVLCOPT:program=%d\n" % (int(sRef.split(':')[3],16))
else:
progopt=""
-- response = "#EXTM3U \n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/%s\n" % (progopt,request.getRequestHostname(),config.OpenWebif.streamport.value, sRef)
+- response = "#EXTM3U \n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:8001/%s\n" % (progopt,request.getRequestHostname(), sRef)
++ #response = "#EXTM3U \n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:8001/%s\n" % (progopt,request.getRequestHostname(), sRef)
+ response = "#EXTM3U \n#EXTVLCOPT--http-reconnect=true \n%shttp://%s:%s/%s\n" % (progopt,request.getRequestHostname(), portNumber, sRef)
-+
request.setHeader('Content-Type', 'application/text')
return response
diff --git a/plugin/controllers/views/ajax/channels.tmpl b/plugin/controllers/views/ajax/channels.tmpl
-index 5975ce8..2915c5b 100755
+index 9bad685..a8253d2 100755
--- a/plugin/controllers/views/ajax/channels.tmpl
+++ b/plugin/controllers/views/ajax/channels.tmpl
-@@ -12,9 +12,12 @@
-
-
-
--
-+
-
-
-+
-+
-+
-
-
- #if $channel.has_key('now_title')
+@@ -15,9 +15,12 @@
+
+
+
+-
++
+
+
++
++
++
+ #else
+
+
diff --git a/plugin/controllers/views/main.tmpl b/plugin/controllers/views/main.tmpl
-index 1844226..6dcfb66 100755
+index 12b9941..3d0debc 100755
--- a/plugin/controllers/views/main.tmpl
+++ b/plugin/controllers/views/main.tmpl
-@@ -9,6 +9,79 @@
+@@ -9,6 +9,69 @@
+
+
-+
Open Webif
-@@ -195,5 +268,12 @@
+@@ -196,5 +259,11 @@
-+
++
+
-+