Remove oldhttp

Sure, this will be unpopular, and this will likely kill you kittens, but
maintaining 2 http interface is stupid and counter-productive.
Let's hope luahttp will finally get fixed.

Makefile.am

@@ -503,27 +503,6 @@ VLC-release.app: vlc
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
 	done
 	$(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/README.txt
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
-	$(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts
-	for i in $(srcdir)/share/http/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http/dialogs/* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http/js/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http/images/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
-	done
-	for i in $(srcdir)/share/http/requests/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
-	done
-	$(INSTALL) -m 644 $(srcdir)/share/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt
 	$(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $(top_builddir)/VLC-release.app/Contents/MacOS/share/vlc512x512.png
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -716,9 +695,6 @@ if BUILD_LUA
 	cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
 endif
 
-if BUILD_HTTPD
-	cp -r $(destdir)/share/vlc/http $(win32_destdir)
-endif
 if BUILD_SKINS
 	cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins
 endif

NEWS

@@ -55,6 +55,7 @@ Interfaces
  * Skins2: fullscreen controller support, relative placement support
    and important cleanups and optimisations
  * ncurses: heavy refactor of the complete interface
+ * removal of http interface in favor of luahttp
 
 Video Output:
  * New video output based on Direct2D for Windows 7 and Vista (with Platform Update)

configure.ac

@@ -335,7 +335,7 @@ case "${host_os}" in
         VLC_ADD_LDFLAGS([vlc],[-mwindows])
         VLC_ADD_LIBS([win32text],[-lgdi32])
         VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
-        VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
+        VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
         VLC_ADD_LIBS([filesystem], [-lshlwapi])
         dnl
         dnl DEP and ASLR options
@@ -366,7 +366,7 @@ case "${host_os}" in
     fi
     if test "${SYS}" = "mingwce"; then
         # add ws2 for closesocket, select, recv
-        VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
+        VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
         VLC_ADD_LIBS([libvlccore],[-lmmtimer])
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
         ac_default_prefix="`pwd`/_wince"
@@ -1642,7 +1642,6 @@ AC_ARG_ENABLE(httpd,
   [  --enable-httpd          HTTP daemon (default enabled)])
 if test "${enable_httpd}" != "no"
 then
-  VLC_ADD_PLUGIN([oldhttp])
   AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
 fi
 AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
@@ -4241,7 +4240,6 @@ AC_CONFIG_FILES([
   modules/codec/spudec/Makefile
   modules/codec/wmafixed/Makefile
   modules/control/Makefile
-  modules/control/http/Makefile
   modules/control/dbus/Makefile
   modules/control/globalhotkeys/Makefile
   modules/demux/Makefile

extras/package/win32/vlc.win32.nsi.in

@@ -528,7 +528,6 @@ Section $Name_Section01 SEC01
   !insertmacro InstallFolder locale
 @BUILD_OSDMENU_TRUE@ !insertmacro InstallFolder osdmenu
 @BUILD_SKINS_TRUE@   !insertmacro InstallFolder skins
-@BUILD_HTTPD_TRUE@   !insertmacro InstallFolder http
 @BUILD_LUA_TRUE@     !insertmacro InstallFolder lua
 
   ; Generate the cache and add it to uninstall.log

modules/control/Modules.am

-SUBDIRS = http globalhotkeys dbus
+SUBDIRS = globalhotkeys dbus
 SOURCES_gestures = gestures.c
 SOURCES_netsync = netsync.c
 SOURCES_ntservice = ntservice.c

modules/control/http/Modules.am

-SOURCES_oldhttp = \
-	http.c \
-	http.h \
-	rpn.c \
-	macro.c \
-	macros.h \
-	mvar.c \
-	util.c \
-	$(NULL)

modules/control/http/macros.h

-/*****************************************************************************
- * macros.h : Macros mapping for the HTTP interface
- *****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
- * $Id$
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
- *          Laurent Aimar <fenrir@via.ecp.fr>
- *          Christophe Massiot <massiot@via.ecp.fr>
- *
- * 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.
- *****************************************************************************/
-
-#include "http.h"
-
-enum macroType
-{
-    MVLC_UNKNOWN = 0,
-    MVLC_CONTROL,
-        MVLC_PLAY,
-        MVLC_STOP,
-        MVLC_PAUSE,
-        MVLC_NEXT,
-        MVLC_PREVIOUS,
-        MVLC_ADD,
-        MVLC_DEL,
-        MVLC_EMPTY,
-        MVLC_SEEK,
-        MVLC_KEEP,
-        MVLC_SORT,
-        MVLC_MOVE,
-        MVLC_VOLUME,
-        MVLC_FULLSCREEN,
-
-        MVLC_CLOSE,
-        MVLC_SHUTDOWN,
-
-        MVLC_VLM_NEW,
-        MVLC_VLM_SETUP,
-        MVLC_VLM_DEL,
-        MVLC_VLM_PLAY,
-        MVLC_VLM_PAUSE,
-        MVLC_VLM_STOP,
-        MVLC_VLM_SEEK,
-        MVLC_VLM_LOAD,
-        MVLC_VLM_SAVE,
-
-    MVLC_INCLUDE,
-    MVLC_FOREACH,
-    MVLC_IF,
-    MVLC_RPN,
-    MVLC_STACK,
-    MVLC_ELSE,
-    MVLC_END,
-    MVLC_GET,
-    MVLC_SET,
-        MVLC_INT,
-        MVLC_FLOAT,
-        MVLC_STRING,
-
-    MVLC_VALUE
-};
-
-/* Static mapping of macros type to macro strings */
-static const struct
-{
-    const char *psz_name;
-    int  i_type;
-}
-StrToMacroTypeTab [] =
-{
-    { "control",    MVLC_CONTROL },
-        /* player control */
-        { "play",           MVLC_PLAY },
-        { "stop",           MVLC_STOP },
-        { "pause",          MVLC_PAUSE },
-        { "next",           MVLC_NEXT },
-        { "previous",       MVLC_PREVIOUS },
-        { "seek",           MVLC_SEEK },
-        { "keep",           MVLC_KEEP },
-        { "fullscreen",     MVLC_FULLSCREEN },
-        { "volume",         MVLC_VOLUME },
-
-        /* playlist management */
-        { "add",            MVLC_ADD },
-        { "delete",         MVLC_DEL },
-        { "empty",          MVLC_EMPTY },
-        { "sort",           MVLC_SORT },
-        { "move",           MVLC_MOVE },
-
-        /* admin control */
-        { "close",          MVLC_CLOSE },
-        { "shutdown",       MVLC_SHUTDOWN },
-
-        /* vlm control */
-        { "vlm_new",        MVLC_VLM_NEW },
-        { "vlm_setup",      MVLC_VLM_SETUP },
-        { "vlm_del",        MVLC_VLM_DEL },
-        { "vlm_play",       MVLC_VLM_PLAY },
-        { "vlm_pause",      MVLC_VLM_PAUSE },
-        { "vlm_stop",       MVLC_VLM_STOP },
-        { "vlm_seek",       MVLC_VLM_SEEK },
-        { "vlm_load",       MVLC_VLM_LOAD },
-        { "vlm_save",       MVLC_VLM_SAVE },
-
-    { "rpn",        MVLC_RPN },
-    { "stack",      MVLC_STACK },
-
-    { "include",    MVLC_INCLUDE },
-    { "foreach",    MVLC_FOREACH },
-    { "value",      MVLC_VALUE },
-
-    { "if",         MVLC_IF },
-    { "else",       MVLC_ELSE },
-    { "end",        MVLC_END },
-    { "get",        MVLC_GET },
-    { "set",        MVLC_SET },
-        { "int",            MVLC_INT },
-        { "float",          MVLC_FLOAT },
-        { "string",         MVLC_STRING },
-
-    /* end */
-    { NULL,         MVLC_UNKNOWN }
-};

po/POTFILES.in

@@ -400,13 +400,6 @@ modules/control/gestures.c
 modules/control/globalhotkeys/win32.c
 modules/control/globalhotkeys/xcb.c
 modules/control/hotkeys.c
-modules/control/http/http.c
-modules/control/http/http.h
-modules/control/http/macro.c
-modules/control/http/macros.h
-modules/control/http/mvar.c
-modules/control/http/rpn.c
-modules/control/http/util.c
 modules/control/lirc.c
 modules/control/motion.c
 modules/control/netsync.c

share/Makefile.am

@@ -30,7 +30,6 @@ EXTRA_DIST = \
 	$(skins2_default_vlt_FILES) \
 	$(DIST_rsrc) \
 	$(DIST_skins2) \
-	$(DIST_http) \
 	$(DIST_http_lua) \
 	$(DIST_lua) \
 	$(DIST_osdmenu_default) \
@@ -42,9 +41,6 @@ if BUILD_SKINS
 nobase_vlcdata_DATA += skins2/default.vlt
 nobase_vlcdata_DATA += $(DIST_skins2)
 endif
-if BUILD_HTTPD
-nobase_vlcdata_DATA += $(DIST_http)
-endif
 if BUILD_OSDMENU
 nobase_vlcdata_DATA += \
 	$(DIST_osdmenu_default)
@@ -86,72 +82,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
 		LC_ALL=C sort -z | \
 		tar cvv --exclude .svn --no-recursion --null -T -) | \
 	gzip -n > skins2/default.vlt
-
-DIST_http = \
-	http/.hosts \
-	http/dialogs/.hosts \
-	http/dialogs/browse \
-	http/dialogs/footer \
-	http/dialogs/input \
-	http/dialogs/main \
-	http/dialogs/mosaic \
-	http/dialogs/playlist \
-	http/dialogs/sout \
-	http/dialogs/vlm \
-	http/favicon.ico \
-	http/images/delete.png \
-	http/images/delete_small.png \
-	http/images/eject.png \
-	http/images/empty.png \
-	http/images/fullscreen.png \
-	http/images/help.png \
-	http/images/info.png \
-	http/images/loop.png \
-	http/images/minus.png \
-	http/images/next.png \
-	http/images/pause.png \
-	http/images/play.png \
-	http/images/playlist.png \
-	http/images/playlist_small.png \
-	http/images/plus.png \
-	http/images/prev.png \
-	http/images/refresh.png \
-	http/images/repeat.png \
-	http/images/sd.png \
-	http/images/shuffle.png \
-	http/images/slider_bar.png \
-	http/images/slider_left.png \
-	http/images/slider_point.png \
-	http/images/slider_right.png \
-	http/images/snapshot.png \
-	http/images/slow.png \
-	http/images/sort.png \
-	http/images/sout.png \
-	http/images/speaker.png \
-	http/images/speaker_mute.png \
-	http/images/stop.png \
-	http/images/vlc16x16.png \
-	http/images/volume_down.png \
-	http/images/volume_up.png \
-	http/images/white.png \
-	http/images/white_cross_small.png \
-	http/index.html \
-	http/js/functions.js \
-	http/js/mosaic.js \
-	http/js/vlm.js \
-	http/mosaic.html \
-	http/requests/browse.xml \
-	http/requests/playlist.xml \
-	http/requests/status.xml \
-	http/requests/vlm.xml \
-	http/requests/vlm_cmd.xml \
-	http/requests/README.txt \
-	http/style.css \
-	http/iehacks.css \
-	http/vlm.html \
-	http/vlm_export.html \
-	http/flash.html
-
 DIST_osdmenu_default = \
 	osdmenu/default.cfg \
 	osdmenu/default/unselected.png \

share/http/.hosts

-#
-# Access-list for VLC HTTP interface
-# $Id$
-#
-
-# localhost
-::1
-127.0.0.1
-
-# link-local addresses
-#fe80::/64
-
-# private addresses
-#fc00::/7
-#fec0::/10
-#10.0.0.0/8
-#172.16.0.0/12
-#192.168.0.0/16
-#169.254.0.0/16
-
-# The world (uncommenting these 2 lines is not quite safe)
-#::/0
-#0.0.0.0/0
-

share/http/dialogs/.hosts

-# This file is an empty access list. Leave it as is.
-# You are not supposed to access files from this directory directly.

share/http/dialogs/browse

-<vlc id="if" param1="0" />
-vim:syntax=html
-<!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  browse: VLC media player web interface - remote file browse dialog
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  Copyright (C) 2005-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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-This dialog needs the following dialogs to be fully functional: <none>
-<vlc id="end" />
-
-<div id="browse" class="popup" style="display: none;">
-  <div class="title">
-    Browse
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('browse');"/>
-  </div>
-  <div id="browser">
-    <a href="javascript:browse_dir(document.getElementById( 'browse_lastdir' ).value);">Click here to browse</a>
-    ( or <a href="javascript:browse_dir('');">here</a> if it doesn't work )
-  </div>
-  <div class="controls">
-    <button id="btn_browse_close" onclick="hide('browse');">
-      Close
-    </button>
-    <input type="hidden" id="browse_lastdir" value="~" />
-    <input type="hidden" id="browse_dest" value="" />
-  </div>
-</div>

share/http/dialogs/footer

-<vlc id="if" param1="0" />
-vim:syntax=html
-<!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  footer: VLC media player web interface - VLC copyright footer
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  Copyright (C) 2005-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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-This dialog needs the following dialogs to be fully functional: <none>
-<vlc id="end" />
-
-<div id="footer" class="dialog" >
-  <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 id="value" param1="copyright" />
-</div>

share/http/dialogs/input

-<vlc id="if" param1="0" />
-vim:syntax=html
-<!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  input: VLC media player web interface - input selection dialog
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  Copyright (C) 2005-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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-This dialog needs the following dialogs to be fully functional: browse
-<vlc id="end" />
-
-<div id="input" class="dialog" style="display: none">
-  <div class="title">
-    Input
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('input');"/>
-  </div>
-  <div class="controls">
-    <label for="input_mrl">Input (MRL)</label>
-    <vlc id="if" param1="page value 'vlm' strcmp 0 =" />
-      <input type="text" name="input_mrl" id="input_mrl" size="60" onkeypress="if( event.keyCode == 13 ) vlm_input_change();"/>
-      <input type="button" value="Ok" onclick="vlm_input_change();" />
-      <input type="button" value="Cancel" onclick="hide('input');" />
-      <input type="hidden" id="input_dest" value="" />
-    <vlc id="else" />
-      <input type="text" name="input_mrl" id="input_mrl" size="60" onkeypress="if( event.keyCode == 13 ) in_play();"/>
-      <input type="button" value="Play" onclick="in_play();" />
-      <input type="button" value="Enqueue" onclick="in_enqueue();" />
-    <vlc id="end" />
-    <br/>
-    <!--<button id="btn_inhide" onclick="hide_input();">
-      Hide
-    </button>-->
-    <button id="btn_file" onclick="hide_input();show('input_file');update_input_file();">
-      File
-    </button>
-    <button id="btn_disc" onclick="hide_input();show('input_disc');update_input_disc();">
-      Disc
-    </button>
-    <button id="btn_network" onclick="hide_input();show('input_network');update_input_net();">
-      Network
-    </button>
-    <button id="btn_fake" onclick="hide_input();show('input_fake');update_input_fake();">
-      Fixed image
-    </button>
-  </div>
-  <div id="input_helper" class="helper" >
-    <div id="input_file" style="display: block">
-      Open File
-      <hr/>
-      <label for="input_file_filename">File name</label>
-      <input type="text" id="input_file_filename" size="60" onchange="update_input_file();" onfocus="update_input_file();"/>
-      <input type="button" id="input_file_browse" value="Browse" onclick="browse( 'input_file_filename' );" />
-      <!-- <hr/>
-      <input type="checkbox" id="input_sub_options" />
-      <label for="input_sub_options">Subtitle options *TODO/FIXME/FIXHTTPD*</label>
-      <br/>
-      <label for="input_sub_file">Subtitles file</label>
-      <input type="text" id="input_sub_file" size="60" />
-      <br/>
-      <label for="input_sub_enc">Subtitles encoding</label>
-      <select id="input_sub_enc">
-        <option></option>
-      </select>
-      <br/>
-      <label for="input_sub_size">Font size</label>
-      <select id="input_sub_size">
-        <option></option>
-      </select>
-      <label for="input_sub_justification">Justification</label>
-      <select id="input_sub_justification">
-        <option></option>
-      </select>
-      <br/>
-      <label for="input_sub_fps">Frames per second</label>
-      <input type="text" id="input_sub_fps" />
-      <label for="input_sub_delay">Delay</label>
-      <input type="text" id="input_sub_delay" />-->
-    </div>
-    <div id="input_disc" style="display: none">
-      Open Disc
-      <hr/>
-      Disc type :
-      <input type="radio" name="input_disc_type" id="input_disc_dvdmenu" value="dvd" onchange="update_input_disc();" />
-      <label for="input_disc_dvdmenu">DVD (menus)</label>
-      <input type="radio" name="input_disc_type" id="input_disc_dvd" value="dvdsimple" onchange="update_input_disc();" />
-      <label for="input_disc_dvd">DVD</label>
-      <input type="radio" name="input_disc_type" id="input_disc_vcd" value="vcd" onchange="update_input_disc();" />
-      <label for="input_disc_vcd">VCD</label>
-      <input type="radio" name="input_disc_type" id="input_disc_cdda" value="cdda" onchange="update_input_disc();" />
-      <label for="input_disc_cdda">Audio CD</label>
-      <hr/>
-      <table>
-        <tr>
-          <td>
-            <label for="input_disc_dev">Device name</label>
-          </td>
-          <td>
-            <input type="text" id="input_disc_dev" onchange="update_input_disc();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="input_disc_title">Title</label>
-          </td>
-          <td>
-            <input type="text" id="input_disc_title" onchange="update_input_disc();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="input_disc_chapter">Chapter</label>
-          </td>
-          <td>
-            <input type="text" id="input_disc_chapter" onchange="update_input_disc();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="input_disc_subtrack">Subtitles track</label>
-          </td>
-          <td>
-             <input type="text" id="input_disc_subtrack" onchange="update_input_disc();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="input_disc_audiotrack">Audio track</label>
-          </td>
-          <td>
-            <input type="text" id="input_disc_audiotrack" onchange="update_input_disc();" />
-          </td>
-        </tr>
-      </table>
-    </div>
-    <div id="input_network" style="display: none">
-      Open Network
-      <hr/>
-      <table>
-        <tr>
-          <td>
-            <input type="radio" name="input_net_type" id="input_net_udp" value="udp" onchange="update_input_net();" />
-            <label for="input_net_udp">UDP/RTP</label>
-          </td>
-          <td>
-            <label for="input_net_udp_port">Port</label>
-            <input type="text" id="input_net_udp_port" size="6" onchange="update_input_net();" />
-            <input type="checkbox" id="input_net_udp_forceipv6" onchange="update_input_net();" />
-            <label for="input_net_udp_forceipv6">Force IPv6</label>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="radio" name="input_net_type" id="input_net_udpmcast" value="udpmcast" onchange="update_input_net();" />
-            <label for="input_net_udpmcast">UDP/RTP Multicast</label>
-          </td>
-          <td>
-            <label for="input_net_udpmcast_address">Address</label>
-            <input type="text" id="input_net_udpmcast_address" onchange="update_input_net();" />
-            <label for="input_net_udpmcast_port">Port</label>
-            <input type="text" id="input_net_udpmcast_port" size="6" onchange="update_input_net();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="radio" name="input_net_type" id="input_net_http" value="http" onchange="update_input_net();" />
-            <label for="input_net_http">HTTP/HTTPS/FTP/MMS</label>
-          </td>
-          <td>
-            <label for="input_net_http_url">URL</label>
-            <input type="text" id="input_net_http_url" onchange="update_input_net();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="radio" name="input_net_type" id="input_net_rtsp" value="rtsp" onchange="update_input_net();" />
-            <label for="input_net_rtsp">RTSP</label>
-          </td>
-          <td>
-            <label for="input_net_rtsp_url">URL</label>
-            <input type="text" id="input_net_rtsp_url" value="rtsp://" onchange="update_input_net();" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <input type="checkbox" id="input_net_timeshift" onchange="update_input_net();" />
-            <label for="input_net_timeshift">Allow timeshifting</label>
-          </td>
-          <td></td>
-        </tr>
-      </table>
-    </div>
-    <div id="input_fake" style="display: none">
-      Fixed image stream (fake)
-      <hr/>
-      <label for="input_fake_filename">Image file name</label>
-      <input type="text" id="input_fake_filename" size="60" onchange="update_input_fake();" onfocus="update_input_fake();"/>
-      <input type="button" id="input_fake_browse" value="Browse" onclick="browse( 'input_fake_filename' );" />
-      <hr/>
-      <label for="input_fake_width">Width</label>
-      <input type="text" id="input_fake_width" size="8" onchange="update_input_fake();" />
-      <label for="input_fake_height">Height</label>
-      <input type="text" id="input_fake_height" size="8" onchange="update_input_fake();" />
-      <label for="input_fake_ar">Aspect ratio</label>
-      <input type="text" id="input_fake_ar" size="8" onchange="update_input_fake();" />
-    </div>
-  </div>
-</div>

share/http/dialogs/main

-<vlc id="if" param1="0" />
-vim:syntax=html
-<!--  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  main: VLC media player web interface - main VLC controler
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >
-<  Copyright (C) 2005-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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
-< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-This dialog needs the following dialogs to be fully functional: input,
-sout and playlist .
-<vlc id="end" />
-
-<div id="main" class="dialog" >
-  <div class="title">
-    VLC media player
-    <button id="btn_toggle_text" onclick="toggle_btn_text();" title="Help" >
-      <img src="images/help.png" alt="Help" />
-      Help
-    </button>
-  </div>
-  <div class="controls">
-    <button id="btn_open" onclick="toggle_show('input');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Open" >
-      <img src="images/eject.png" alt="Open" />
-      <span class="btn_text">Open</span>
-    </button>
-    &nbsp;
-    <button id="btn_stop" onclick="pl_stop();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Stop" >
-      <img src="images/stop.png" alt="Stop" />
-      <span class="btn_text">Stop</span>
-    </button>
-    <!--<button id="btn_play" onclick="alert('FIXME');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Play" >
-      <img src="images/play.png" alt="Play" />
-      <span class="btn_text">Play</span>
-    </button>-->
-    <button id="btn_pause" onclick="pl_pause();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Pause" >
-      <img src="images/pause.png" alt="Pause" id="btn_pause_img" />
-      <span class="btn_text">Pause</span>
-    </button>
-    &nbsp;
-    <button id="btn_previous" onclick="pl_previous();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Previous" >
-      <img src="images/prev.png" alt="Previous" />
-      <span class="btn_text">Previous</span>
-    </button>
-    <button id="btn_next" onclick="pl_next();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Next" >
-      <img src="images/next.png" alt="Next" />
-      <span class="btn_text">Next</span>
-    </button>
-    &nbsp;
-    <button id="btn_sout" onclick="toggle_show('sout');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Stream Output" >
-      <img src="images/sout.png" alt="Stream Output" />
-      <span class="btn_text">Stream Output</span>
-    </button>
-    <button id="btn_playlist" onclick="toggle_show('playlist');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Playlist" >
-      <img src="images/playlist.png" alt="Playlist" />
-      <span class="btn_text">Playlist</span>
-    </button>
-    <button id="btn_info" onclick="toggle_show('info');" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Info" >
-      <img src="images/info.png" alt="Info" />
-      <span class="btn_text">Info</span>
-    </button>
-    &nbsp;
-    <button id="btn_fullscreen" onclick="fullscreen();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Fullscreen" >
-      <img src="images/fullscreen.png" alt="Fullscreen" />
-      <span class="btn_text">Fullscreen</span>
-    </button>
-    &nbsp;
-    <button id="btn_snapshot" onclick="snapshot();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Take video snapshot" >
-      <img src="images/snapshot.png" alt="Take video snapshot" />
-      <span class="btn_text">Take video snapshot</span>
-    </button>
-    &nbsp;
-    <button id="btn_volume_down" onclick="volume_down();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Decrease Volume" >
-      <img src="images/volume_down.png" alt="Decrease Volume" />
-      <span class="btn_text">Decrease Volume</span>
-    </button>
-    <button id="btn_volume_up" onclick="volume_up();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Increase Volume" >
-      <img src="images/volume_up.png" alt="Increase Volume" />
-      <span class="btn_text">Increase Volume</span>
-    </button>
-    <button id="btn_volume_mute" onclick="volume_mute();" onmouseover="button_over(this);" onmouseout="button_out(this);" title="Mute Volume" >
-      <img src="images/speaker_mute.png" alt="Mute Volume" />
-      <span class="btn_text">Mute Volume</span>
-    </button>
-  </div>
-  <div id="status">
-    <span id="state">(?)</span>
-    -
-    Time : <span id="time">(?)</span>/<span id="length">(?)</span>
-    -
-    Volume : <span id="volume">(?)</span>
-    <br/>
-    <!-- progress bar -->
-    <img src="images/slider_left.png" alt="slider left" /><span id="progressbar" style="background-image: url( 'images/slider_bar.png' ); width: 408px; height:16px; position:absolute;" onclick="slider_seek( event, this );" onmousemove="slider_move( event, this );"><img src="images/slider_point.png" alt="slider point" style="position:relative; left:0px;" id="main_slider_point" onmousedown="slider_down( event, this );" onmouseup="slider_up( event, this.parentNode );" onmouseout="slider_up( event, this.parentNode );"/></span><img src="images/slider_right.png" alt="slider right" style="position:relative;left:408px;" />
-    <br/>
-    <span id="nowplaying">(?)</span>
-    <img id="albumart" alt="" src="/art" style="float: right" onclick="refresh_albumart(true);"/>
-  </div>
-</div>
-
-<div id="info" class="dialog" style="display: none;" >
-  <div class="title">
-    Stream and media info
-    <img class="close" src="images/white_cross_small.png" alt="Close" onclick="hide('info');"/>
-  </div>
-  <div id="infotree">
-  </div>
-</div>

share/http/flash.html

-<!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( /[:/].*/, '' );
-// ]]>
-</script>
-</head>
-
-<body onload="hide('playlist');">
-  <vlc id="include" param1="dialogs/browse" />
-  <vlc id="include" param1="dialogs/main" />
-  <vlc id="include" param1="dialogs/input" />
-  <vlc id="include" param1="dialogs/playlist" />
-
-  <input id="sout_mrl" type="hidden" value=":sout=#transcode{vcodec=FLV1,acodec=mp3,channels=2,samplerate=44100}:std{access=http,mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv} :no-sout-keep" />
-
-  <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 id="include" param1="dialogs/footer" />
-</body>
-
-</html>