[vlc-commits] luahttp: remove old flash
Francois Cartegnie
git at videolan.org
Tue Sep 13 23:25:56 CEST 2011
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Sep 13 12:50:41 2011 +0200| [76aa0c1e95bcd1b5d903584b8a0baf162379ed04] | committer: Francois Cartegnie
luahttp: remove old flash
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=76aa0c1e95bcd1b5d903584b8a0baf162379ed04
---
share/Makefile.am | 2 -
share/lua/http/dialogs/footer | 1 -
share/lua/http/flash.html | 48 -----------------------------------------
share/lua/http/iehacks.css | 38 --------------------------------
4 files changed, 0 insertions(+), 89 deletions(-)
diff --git a/share/Makefile.am b/share/Makefile.am
index dd0b1cb..619b697 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -270,7 +270,6 @@ DIST_http_lua = \
lua/http/dialogs/sout \
lua/http/dialogs/vlm \
lua/http/custom.lua \
- lua/http/flash.html \
lua/http/vlm.html \
lua/http/images/loop.png \
lua/http/images/buttons.png \
@@ -349,7 +348,6 @@ DIST_http_lua = \
lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png \
lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png \
lua/http/css/main.css \
- lua/http/iehacks.css \
lua/http/js/jquery-1.5.1.min.js \
lua/http/js/functions.js \
lua/http/js/vlm.js \
diff --git a/share/lua/http/dialogs/footer b/share/lua/http/dialogs/footer
index a9397ff..b17d462 100644
--- a/share/lua/http/dialogs/footer
+++ b/share/lua/http/dialogs/footer
@@ -30,7 +30,6 @@ This dialog needs the following dialogs to be fully functional: <none>
<a href="/">main VLC interface</a> -
<a href="/vlm.html">VLM interface</a> -
<a href="/mosaic.html">Mosaic wizard</a> -
- <a href="/flash.html">Flash based remote playback</a> -
<a href="http://www.videolan.org">VideoLAN website</a>
<br />
<?vlc print(vlc.misc.version() .. " - Lua Web Interface - " .. vlc.misc.copyright()) ?>
diff --git a/share/lua/http/flash.html b/share/lua/http/flash.html
deleted file mode 100644
index e38c842..0000000
--- a/share/lua/http/flash.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
- <title>VLC media player - Web Interface with Flash Viewer</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link href="style.css" rel="stylesheet" type="text/css" />
- <!--[if IE ]>
- <link href="iehacks.css" rel="stylesheet" type="text/css" />
- <![endif]-->
- <script type="text/javascript" src="js/functions.js"></script>
-<script type="text/javascript">
-// <![CDATA[
-host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/, '' );
-input_options.push( ":sout=#transcode{vcodec=h264,acodec=mp3,channels=2,samplerate=44100}:std{access=http,dst=0.0.0.0:8081/stream.flv}" );
-input_options.push( ":no-sout-keep" );
-// ]]>
-</script>
-</head>
-
-<body onload="hide('playlist'); refresh_input_options_list();">
-<?vlc
-current_page = "index"
-dialogs("browse","main","input","playlist") ?>
-
- <div style='height: 100%; width: 100%; text-align: center;'>
- <object type="application/x-shockwave-flash" data="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" width="800px" height="600px" id="FlowPlayer" style="z-index: 0">
- <param name="allowScriptAccess" value="sameDomain" />
- <param name="movie" value="http://flowplayer.sourceforge.net/video/FlowPlayer.swf" />
- <param name="quality" value="high" />
- <!-- <param name="scale" value="noScale" />-->
- <param name="wmode" value="transparent" />
- <!-- <param name="flashvars" value="config={ loop: false, initialScale: \'fit\', autoPlay: false, configInject: true}" />-->
- <script type="text/javascript">
-// <![CDATA[
- document.write( '' +
-' <param name="flashvars" value="config={ loop: false, initialScale: \'fit\', autoPlay: false, playList: [{ url: \'http://' + host + ':8081/stream.flv\', controlEnabled: true}] }" />' );
-// ]]>
-</script>
- </object>
- <p style="font-size: small;">Uses the <a href="http://flowplayer.sourceforge.net/">Flow Player</a> free flash video player for playback (client side).</p>
- </div>
-
-<?vlc dialogs("footer") ?>
-</body>
-
-</html>
diff --git a/share/lua/http/iehacks.css b/share/lua/http/iehacks.css
deleted file mode 100644
index 2d51ff1..0000000
--- a/share/lua/http/iehacks.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * iehacks.css: VLC media player web interface
- *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- * $Id$
- *
- * Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-div.menu {
- margin-left: -30px;
- margin-top: 15px;
- background: #fff;
-}
-div.menu button {
- background: #fff;
-}
-div.menu button.menuout {
- border: 1px solid #fff;
-}
-
-div#mosaic_list {
- background: #fff;
-}
More information about the vlc-commits
mailing list