From: kos <kos@dev3>
Date: Thu, 24 Oct 2013 10:23:14 +0000 (+0900)
Subject: remove openwebif patch.
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=82e67b7ce45fafc300d7b36f22a9c854bd8902af;hp=e63147cddf3b080227872dd7846170b7dba2db47

remove openwebif patch.
---

diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
index 7445828..37833fe 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
@@ -9,12 +9,10 @@ RDEPENDS_${PN} = "python-cheetah python-json python-unixadmin python-misc python
 inherit gitpkgv
 PV = "0.1+git${SRCPV}"
 PKGV = "0.1+git${GITPKGV}"
-PR = "r0.78"
+PR = "r0.79"
 
 require openplugins.inc
 
-SRC_URI += " file://openwebif-filestreamproxy-support.patch;apply=yes;striplevel=1 "
-
 # Just a quick hack to "compile" it
 do_compile() {
 	cheetah-compile -R --nobackup ${S}/plugin
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-filestreamproxy-support.patch b/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-filestreamproxy-support.patch
deleted file mode 100644
index a530932..0000000
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/files/openwebif-filestreamproxy-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-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 @@
- 						</div>
- 					#end if
- 				</div>
--				<div class="moviecontainer_right">
--					<div style="padding: 3px; text-align: right;">
--						<a target="_blank" href='/web/ts.m3u?file=$quote($movie.filename)'>
--						<img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
--						</a>
--						<a href='/file?action=download&file=$quote($movie.filename)'>
--						<img align="top" src="../images/ico_download.png" title="Download $movie.eventname" border="0">
--						</a>
--						<a href='#' onClick="deleteMovie('$quote($movie.serviceref)', '$count'); return false;">
--						<img src="../images/ico_delete.png" title="Delete Movie" border="0"></a>
--						</a>
--					</div>
--				</div>
-+                                <div class="moviecontainer_right">
-+                                        <div style="padding: 3px; text-align: right;">
-+						#if $transcoding
-+						<a href="#" onclick="jumper80('$quote($movie.filename)');">
-+                                                <img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
-+                                                </a>
-+                                                <a href="#" onclick="jumper8003('$quote($movie.filename)');">
-+                                                <img align="top" src="../images/ico_stream.png" title="Stream(8003) $movie.eventname" border="0">
-+                                                </a>
-+						#else
-+                                                <a target="_blank" href='/web/ts.m3u?file=$quote($movie.filename)'>
-+                                                <img align="top" src="../images/ico_stream.png" title="Stream $movie.eventname" border="0">
-+                                                </a>
-+						#end if
-+                                                <a href='/file?action=download&file=$quote($movie.filename)'>
-+                                                <img align="top" src="../images/ico_download.png" title="Download $movie.eventname" border="0">
-+                                                </a>
-+                                                <a href='#' onClick="deleteMovie('$quote($movie.serviceref)', '$count'); return false;">
-+                                                <img src="../images/ico_delete.png" title="Delete Movie" border="0"></a>
-+                                                </a>
-+                                        </div>
-+                                </div>
- 				<div style="clear: both;"></div>
- 				#set $count += 1
- 			</div>
-@@ -72,4 +81,4 @@
- 
- <script type="text/javascript">
- \$('#moviebuttons').buttonset();
--</script>
-\ No newline at end of file
-+</script>
-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 @@
- 		<input type="hidden" name="name">
- 		<input type="hidden" name="device">
- 	</form>
-+	<form name="portFormTs" action="/web/ts.m3u" method="GET" target="_blank">
-+		<input type="hidden" name="file">
-+		<input type="hidden" name="device">
-+	</form>
- </body>
- </html>
-diff --git a/plugin/public/js/transcoding.js b/plugin/public/js/transcoding.js
-index 8729835..785a4b7 100644
---- a/plugin/public/js/transcoding.js
-+++ b/plugin/public/js/transcoding.js
-@@ -41,6 +41,20 @@ function getOSType() {
- 		return "unknown";
- }
- 
-+function jumper80( file ) {
-+	var deviceType = getDeviceType();
-+	document.portFormTs.file.value = file;
-+	document.portFormTs.device.value = "etc";
-+	document.portFormTs.submit();
-+}
-+
-+function jumper8003( file ) {
-+	var deviceType = getDeviceType();
-+	document.portFormTs.file.value = file;
-+	document.portFormTs.device.value = "phone";
-+	document.portFormTs.submit();
-+}
-+
- function jumper8002( sref, sname ) {
- 	var deviceType = getDeviceType();
- 	document.portForm.ref.value = sref;