]> git.sesse.net Git - vlc/commitdiff
http: Removing the old http interface.
authorDerk-Jan Hartman <hartman@videolan.org>
Fri, 12 Jun 2009 14:18:29 +0000 (16:18 +0200)
committerDerk-Jan Hartman <hartman@videolan.org>
Fri, 12 Jun 2009 14:18:29 +0000 (16:18 +0200)
This closes #1395

17 files changed:
Makefile.am
share/Makefile.am
share/http/old/.hosts [deleted file]
share/http/old/admin/.access [deleted file]
share/http/old/admin/browse.html [deleted file]
share/http/old/admin/dboxfiles.html [deleted file]
share/http/old/admin/index.html [deleted file]
share/http/old/cone_minus.png [deleted file]
share/http/old/cone_plus.png [deleted file]
share/http/old/index.html [deleted file]
share/http/old/info.html [deleted file]
share/http/old/style.css [deleted file]
share/http/old/vlm/edit.html [deleted file]
share/http/old/vlm/index.html [deleted file]
share/http/old/vlm/new.html [deleted file]
share/http/old/vlm/show.html [deleted file]
share/http/old/webcam.html [deleted file]

index 5de28caa739a61b89a4ade543812c3350732102b..405d454972715547bc1e0d9840ed72fe84a3c352 100644 (file)
@@ -543,13 +543,9 @@ VLC-release.app: vlc
        $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(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/old
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
        $(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
-       $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
        for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done
@@ -559,15 +555,6 @@ VLC-release.app: vlc
        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/old/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
-       done
-       for i in $(srcdir)/share/http/old/admin/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
-       done
-       for i in $(srcdir)/share/http/old/vlm/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`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
@@ -839,9 +826,6 @@ if BUILD_HTTPD
        mkdir -p "$(win32_http_destdir)/requests"
        mkdir -p "$(win32_http_destdir)/js"
        mkdir -p "$(win32_http_destdir)/dialogs"
-       mkdir -p "$(win32_http_destdir)/old"
-       mkdir -p "$(win32_http_destdir)/old/vlm"
-       mkdir -p "$(win32_http_destdir)/old/admin"
        cp $(srcdir)/share/http/*.html $(win32_http_destdir)/
        unix2dos $(win32_http_destdir)/*.html
        cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/
@@ -861,16 +845,6 @@ if BUILD_HTTPD
        cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt
        unix2dos $(win32_http_destdir)/requests/readme.txt
 
-       cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/
-       unix2dos $(win32_http_destdir)/old/*.html
-       cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/
-       cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/
-       cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/
-       cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/
-       unix2dos $(win32_http_destdir)/old/vlm/*.html
-       cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/
-       unix2dos $(win32_http_destdir)/old/admin/*.html
-       cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/
 endif
 
 if BUILD_SKINS
index 3abf2d146f014f11cebc9e5dc5c54f4a78f31368..6379fed67bc9e41c8e86834260388c42267811c7 100644 (file)
@@ -178,21 +178,6 @@ DIST_http = \
        http/js/mosaic.js \
        http/js/vlm.js \
        http/mosaic.html \
-       http/old/.hosts \
-       http/old/admin/.access \
-       http/old/admin/browse.html \
-       http/old/admin/dboxfiles.html \
-       http/old/admin/index.html \
-       http/old/cone_minus.png \
-       http/old/cone_plus.png \
-       http/old/index.html \
-       http/old/info.html \
-       http/old/style.css \
-       http/old/vlm/edit.html \
-       http/old/vlm/index.html \
-       http/old/vlm/new.html \
-       http/old/vlm/show.html \
-       http/old/webcam.html \
        http/requests/browse.xml \
        http/requests/playlist.xml \
        http/requests/status.xml \
diff --git a/share/http/old/.hosts b/share/http/old/.hosts
deleted file mode 100644 (file)
index 6f54ae0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# 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
-
diff --git a/share/http/old/admin/.access b/share/http/old/admin/.access
deleted file mode 100644 (file)
index 8a5c9a6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-admin:admin
diff --git a/share/http/old/admin/browse.html b/share/http/old/admin/browse.html
deleted file mode 100644 (file)
index 9eb5057..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
-    <title>VLC media player - Browser</title>
-    <link href="../style.css" title="Default" rel="stylesheet" type="text/css" />
-
-    <vlc id="if" param1="'control' url_extract strlen"/>
-        <meta http-equiv="refresh" content="0;URL=/old/admin/browse.html?dir=<vlc id="value" param1="'dir' url_extract" />" />
-    <vlc id="end" />
-
-    <vlc id="control" param1="add"/>
-</head>
-<body>
-    <h2><center><a href="/old/">VLC media player <vlc id="value" param1="version" /></a></center></h2>
-    <hr/>
-    <table  width="100%" border=0 cellspacing=1 cellpadding=2>
-    <tr>
-        <th align="left" bgcolor="#88ff88" colspan="2">File (<vlc id="value" param1="'dir' url_extract" />)</th>
-        <th align="left" bgcolor="#cccccc">Size</th>
-        <th align="left" bgcolor="#cccccc">Date</th>
-    </tr>
-    <p>This page is default disabled for security reasons (change _directory_ into directory to enable it).</p>
-    <vlc id="rpn" param1="counter 0 store" />
-    <vlc id="rpn" param1="'dir' url_extract" />
-    <vlc id="foreach" param1="file" param2="_directory_" />
-        <vlc id="rpn" param1="counter counter value 1 + store" />
-        <tr class="<vlc id="if" param1="counter value 2 % 0 =" />line1<vlc id="else" />line2<vlc id="end" />">
-            <td>
-                <vlc id="if" param1="file.type value 'directory' strcmp 0 =" />
-                    <img src="/icons/dir.gif" alt=[DIR]" border="0" width="20" height="22">
-                    <a href="?dir=<vlc id="value" param1="file.name" />"><vlc id="value" param1="file.name" /></a>
-                <vlc id="else" /> 
-                    <img src="/icons/text.gif" alt=[FILE]" border="0" width="20" height="22">
-                    <vlc id="value" param1="file.name" />
-                <vlc id="end" />
-            </td>
-            <td align="right">
-                <form method="get" action="">
-                    <input type="hidden" name="dir" value="<vlc id="value" param1="'dir' url_extract" />"/>
-                    <input type="hidden" name="mrl" value="<vlc id="value" param1="file.name" />"/>
-                    <input type="submit" name="control" value="add" />
-                </form>
-            </td>
-            <td align="right"><vlc id="value" param1="file.size" /></td>
-            <td align="center"><vlc id="value" param1="file.date" /></td>
-        </tr>
-    <vlc id="end" />
-    </table>
-    <hr/>
-    <p><vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/admin/dboxfiles.html b/share/http/old/admin/dboxfiles.html
deleted file mode 100644 (file)
index e9d0f7b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<vlc id="rpn" param1="'stream_position' url_extract" /><vlc id="if" param1="value 'true' strcmp 0 =" /><vlc id="value" param1="stream_position" /><vlc id="end" /><vlc id="rpn" param1="'stream_time' url_extract" /><vlc id="if" param1="value 'true' strcmp 0 =" /><vlc id="value" param1="stream_time" /><vlc id="end" /><vlc id="rpn" param1="'stream_length' url_extract" /><vlc id="if" param1="value 'true' strcmp 0 =" /><vlc id="value" param1="stream_length" /><vlc id="end" /><vlc id="rpn" param1="'dir' url_extract" /><vlc id="foreach" param1="file" param2="directory" /><vlc id="if" param1="file.type value 'directory' strcmp 0 =" />DIR:<vlc id="value" param1="file.name" /><vlc id="else" /><vlc id="value" param1="file.name" /><vlc id="end" />
-<vlc id="end" />
\ No newline at end of file
diff --git a/share/http/old/admin/index.html b/share/http/old/admin/index.html
deleted file mode 100644 (file)
index 0641f09..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
-    <title>VLC media player</title>
-    <style>
-        body {font-family:Verdana, Arial, Sans Serif; }
-        h2 { text-align:center; }
-       td {border:1pt black solid;margin:0em; }
-        table.border {border:1pt black solid;}
-        div.section {background-color:#DDDDFF;
-             border:1pt black solid;
-             margin-bottom:2em;
-            padding:0.5em; }
-       div.section-ctr {background-color:#CCCCFF;
-             border:1pt black solid;
-             margin-bottom:2em;
-             padding:0.5em;
-            font-size:1.2em;
-            text-align:center; }
-
-        div.sectitle {  background-color:#5A5ABB;
-                        color:#FFFFFF;
-                        border:1pt black solid;
-                        width:20%;
-                        font-weight:bold;}
-        tr.ligne1 { background-color:#EEFFFF; }
-        tr.ligne2 { background-color:#CCCCFF; }
-    </style>
-    <vlc id="if" param1="url_param"/>
-        <meta http-equiv="refresh" content="0;URL=/old/admin/" />
-    <vlc id="end" />
-
-    <vlc id="control" />
-    <vlc id="set" param1="sout" param2="string" />
-</head>
-<body>
-    <h2><a href="/old/">VLC media player - Admin <vlc id="value" param1="version" /></a></h2>
-
-<div class="section-ctr">Shutdown VLC<br /> <form method="get" action=""> <input type="submit" name="control" value="shutdown" /> </form></div>
-
-  <div class="sectitle">Host list</div>
-  <div class="section">
-    <table class="border" >
-    <tr>
-        <th>Id</th><th>Host</th><th>IP</th><th>Port</th>
-    </tr>
-    <vlc id="foreach" param1="host" param2="hosts" />
-        <tr>
-        <td><vlc id="value" param1="host.id" /></td>
-        <td><vlc id="value" param1="host.host" /> </td>
-        <td><vlc id="value" param1="host.ip" /> </td>
-        <td><vlc id="value" param1="host.port" /> </td>
-        </tr>
-    <vlc id="end" />
-    </table>
-   </div>
-   <div class="sectitle">File list</div>
-   <div class="section">
-    <table border="1" cellspacing="0" >
-    <tr>
-        <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>Usage</th>
-    </tr>
-    <vlc id="foreach" param1="url" param2="urls" />
-        <vlc id="if" param1="url.stream 0 =" /> 
-            <tr>
-            <td><vlc id="value" param1="url.id" /></td>
-            <td><vlc id="value" param1="url.url" /></td>
-            <td><vlc id="value" param1="url.mime" /></td>
-            <td><vlc id="value" param1="url.protected" /></td>
-            <td><vlc id="value" param1="url.used" /></td>
-            </tr>
-        <vlc id="end" />
-    <vlc id="end" />
-    </table>
-   </div>
-
-
-   <div class="sectitle">Stream list</div>
-   <div class="section">
-    <table border="1" cellspacing="0" >
-    <tr>
-        <th>Id</th><th>URL</th><th>Mime</th><th>Protected</th><th>Usage</th>
-    </tr>
-    <vlc id="foreach" param1="url" param2="urls" />
-        <vlc id="if" param1="url.stream" />
-            <tr>
-            <td><vlc id="value" param1="url.id" /></td>
-            <td><vlc id="value" param1="url.url" /></td>
-            <td><vlc id="value" param1="url.mime" /></td>
-            <td><vlc id="value" param1="url.protected" /></td>
-            <td><vlc id="value" param1="url.used" /></td>
-            </tr>
-        <vlc id="end" />
-    <vlc id="end" />
-    </table>
-   </div>
-
-   <div class="sectitle">Connections list</div>
-   <div class="section">
-    <table border="1" cellspacing="0" >
-    <tr>
-        <th>Id</th><th>ip</th><th>URL</th><th>Status</th><th>Actions</th>
-    </tr>
-    <vlc id="foreach" param1="con" param2="connections" />
-        <tr>
-        <td><vlc id="value" param1="con.id" /></td>
-        <td><vlc id="value" param1="con.ip" /></td>
-        <td><vlc id="value" param1="con.url" /></td>
-        <td><vlc id="value" param1="con.status" /></td>
-        <td>
-        <form method="get" action="">
-            <input type="hidden" name="id" value="<vlc id="value" param1="con.id" />"/>
-            <input type="submit" name="control" value="close" />
-        </form>
-
-        </td>
-        </tr>
-    <vlc id="end" />
-    </table>
-   </div>
-    <hr />
-    <p> <vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
-
diff --git a/share/http/old/cone_minus.png b/share/http/old/cone_minus.png
deleted file mode 100644 (file)
index b7a75e7..0000000
Binary files a/share/http/old/cone_minus.png and /dev/null differ
diff --git a/share/http/old/cone_plus.png b/share/http/old/cone_plus.png
deleted file mode 100644 (file)
index d093904..0000000
Binary files a/share/http/old/cone_plus.png and /dev/null differ
diff --git a/share/http/old/index.html b/share/http/old/index.html
deleted file mode 100644 (file)
index 6036377..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- $Id$-->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
- <head>
-    <title>VLC media player</title>
-    <link href="style.css" title="Default" rel="stylesheet" type="text/css" />
-    <!-- Work around. should be done in the code -->
-    <vlc id="if" param1="url_param"/>
-        <meta http-equiv="Refresh" content="0;url=/old/" />
-    <vlc id="else" />
-        <meta http-equiv="Refresh" content="60;url=/old/">
-    <vlc id="end" />
-    
-    <vlc id="control" param1="stop,pause,previous,next,add,sout,play,delete,empty,seek,fullscreen,keep,volume,sort,move" />
-    <vlc id="set" param1="sout" param2="string" />
-<script type="text/javascript">
-
-function changeMe(item)
-{
-  if (item.parentNode.lastChild.style.display=="none")
-  {
-    item.parentNode.lastChild.style.display="block";
-    item.alt="[-]";
-    item.src="cone_minus.png";
-  }
-  else
-  {
-    item.parentNode.lastChild.style.display="none";
-    item.alt="[+]";
-    item.src="cone_plus.png";
-  }
-}
-</script>
-
-</head>
-
-
- <body>
-
-    <!-- left menu -->
-    <div class="left">
-      <div class="sectitle">Playback control</div>
-      <div class="section-controls">
-        <p>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="control" value="stop" />
-          </form>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="control" value="pause" />
-          </form>
-        </p>
-        <p>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="control" value="previous" />
-          </form>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="control" value="next" />
-          </form>
-        </p>
-        <p>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="seek_value" value="-1min"/><input type="hidden" name="control" value="seek"/>
-          </form>
-          <form method="get" action="" style="display: inline">
-            <input type="submit" name="seek_value" value="+1min"/><input type="hidden" name="control" value="seek"/>
-          </form>
-        </p>
-        <p>
-          <form method="get" action="">
-            <input type="text" name="seek_value" size="14"/><input type="hidden" name="control" value="seek"/>
-            <input type="submit" value="Seek" />
-          </form>
-        </p>
-        <p>
-          <span class="small">( Seek Textbox: for example "+12min 42sec", "01:13:43", "-12%" etc... )</span>
-        </p>
-      </div> <!-- End section -->
-
-      <div class="sectitle">Misc controls</div>
-      <div class="section-controls">
-        <form method="get" action="">
-               <input type="hidden" name="control" value="volume" />
-          Vol: <input type="text" name="value" size="5"/>
-               <input type="submit" value="Set" /><br /> (0 - 1024)<br /><span class="small">(for example: "536", "-12", "+42", "36%")</span>
-        </form>
-        <br />
-        <form method="get" action="">
-          <input type="submit" name="control" value="fullscreen" />
-        </form>
-      </div>
-
-      <div class="sectitle">Status</div>
-      <div class="section">
-        State: <vlc id="value" param1="stream_state" /><br />
-        Length: <span id="length"><vlc id="value" param1="stream_length" /> s
-                </span><br />
-        Time: <span id="time"><vlc id="value" param1="stream_time" /> s</span><br />
-        Volume: <span id="volume"><vlc id="value" param1="volume" /></span>
-        <br /><a href="info.html">Information</a>  
-      </div>
-
-      <div class="section"><a href="admin/">Administration Page</a></div>
-
-    </div>
-    <!-- end left -->
-
-    <!-- main content -->
-    <div class ="right">
-      <h2 class="title"><a href="http://www.videolan.org/">VLC media player
-        <vlc id="value" param1="version" /></a> (http interface)
-      </h2>
-
-      <div class="sectitle">Add</div>
-      <div class="section">
-        <table class="add">
-          <tr>
-           <form method="get" action="?" enctype="text/plain" >
-              <td>Add a MRL (Media Resource Locator) to the playlist</td>
-              <td>
-               <input type="hidden" name="control" value="add" />
-              <input type="text" name="mrl" size="40" />
-              <input type="submit" value="Add" />
-             </td>
-             </form> 
-          </tr>
-         <tr>
-            <form method="get" action="" enctype="text/plain" >
-              <td>Stream Output:</td>
-              <td>
-              <input type="text" name="sout" size="40" value="<vlc id="get" param1="sout" param2="string" />" />
-              <input type="submit"  value="Sout" />
-             </td>
-             </form>
-           </tr>
-          </table>
-      </div>
-<!-- Playlist -->
-      <div class="section">
-       <form method="get" action="">
-         <ul id="playlist">
-           <vlc id="rpn" param1="first_item 0 store" />
-           <vlc id="rpn" param1="last_depth 0 store" />
-           <vlc id="foreach" param1="pl" param2="playlist" />
-                 <vlc id="if" param1="pl.depth value last_depth value <" />
-                     <vlc id="rpn" param1="pl.depth value ':' last_depth value 1 - ':' 1 strcat strcat strcat strcat" />
-                     <vlc id="foreach" param1="the_final_countdown" param2="integer" />
-                         </ul></li>
-                     <vlc id="end" />
-                 <vlc id="end" />
-
-               <vlc id="if" param1="pl.type value 'Node' strcmp" />
-                 <vlc id="rpn" param1="1 +" />
-                 <li>
-                   <input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/>
-                   <vlc id="if" param1="pl.current" />
-                     <strong>
-                   <vlc id="end" />
-                   <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />">
-                   <vlc id="value" param1="pl.name" /><vlc id="if" param1="pl.uri value pl.name value strcmp"/>  (<vlc id="value" param1="pl.uri" />)<vlc id="end"/></a>
-                   <vlc id="if" param1="pl.current" />
-                     </strong>
-                   <vlc id="end" />
-                 </li>
-               <vlc id="else" />
-                 <li>
-                   <vlc id="if" param1="first_item value 0 ="/>
-                   <img alt="Cone" src="cone_plus.png" />
-                     Playlist
-                     <vlc id="rpn" param1="first_item 1 store" />
-                   <vlc id="else"/>
-                   <img alt="[-]" src="cone_minus.png" onclick='changeMe(this)'/>
-                   <vlc id="if" param1="pl.depth value 0 >"/>
-                     <input type="checkbox" name="item" value="<vlc id="value" param1="pl.index" />"/>
-                    <a href="?control=play&amp;item=<vlc id="value" param1="pl.index" />">
-                   <vlc id="end"/>
-                  <vlc id="value" param1="pl.name" />
-                   <vlc id="if" param1="pl.depth value 0 >"/>
-                     </a>
-                   <vlc id="end"/>
-                  (<vlc id="value" param1="pl.i_children" />
-                   item<vlc id="if" param1="pl.i_children 1 >" />s<vlc id="end" />)
-                   <vlc id="end"/>
-
-                   <vlc id="if" param1="pl.i_children 0 !=" />
-                       <ul>
-                   <vlc id="else" />
-                       </li>
-                   <vlc id="end" />
-
-               <vlc id="end" />
-
-               <vlc id="rpn" param1="last_depth pl.depth value store" />
-
-           <vlc id="end" />
-     <vlc id="rpn" param1="0 ':' last_depth value 1 - ':' 1 strcat strcat strcat strcat" />
-     <vlc id="foreach" param1="the_final_countdown" param2="integer" />
-         </ul></li>
-     <vlc id="end" />
-
-         </ul>
-         <input type="submit" name="control" value="delete" />
-         <input type="submit" name="control" value="empty" />
-         <input type="submit" name="control" value="keep" />
-                     <input type="submit" name="control" value="sort" /> by
-                     <select name="type">
-                       <option value="title">title</option>
-                       <option value="shuffle">shuffle</option>
-                     </select> with
-                     <select name="order">
-                       <option value="0">normal order</option>
-                       <option value="1">reverse order</option>
-                     </select>
-        
-       </form>
-      </div>
-    </div>
-    <!-- end main content -->
-    
-    <p style="text-align:center;font-size:1.2em;"> <vlc id="value" param1="copyright" /> </p>
-
-    <script type="text/javascript">
-      got_time = <vlc id="value" param1="stream_time" />;
-      hours = Math.floor(got_time/ 3600);
-      minutes = Math.floor((got_time/60) % 60);
-      seconds = got_time % 60;
-      if ( hours < 10 ) hours = "0" + hours;
-      if ( minutes < 10 ) minutes = "0" + minutes;
-      if ( seconds < 10 ) seconds = "0" + seconds;
-      document.getElementById('time').innerHTML = hours+":"+minutes+":"+seconds;
-      got_length = <vlc id="value" param1="stream_length" />;
-      hours = Math.floor(got_length/ 3600);
-      minutes = Math.floor((got_length/60) % 60);
-      seconds = got_length % 60;
-      if ( hours < 10 ) hours = "0" + hours;
-      if ( minutes < 10 ) minutes = "0" + minutes;
-      if ( seconds < 10 ) seconds = "0" + seconds;
-      document.getElementById('length').innerHTML = hours+":"+minutes+":"+seconds;
-      got_volume = <vlc id="value" param1="volume" />;
-      document.getElementById( 'volume').innerHTML = Math.ceil(got_volume * 400/1024) + " %";
-    </script>
-</body>
-</html>
diff --git a/share/http/old/info.html b/share/http/old/info.html
deleted file mode 100644 (file)
index 12cbada..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-    <title>VLC media player - Information</title>
-</head>
-<body>
-    <h2><center><a href="/old/">VLC media player <vlc id="value" param1="version" /></a></center></h2>
-    <hr/>
-    <vlc id="foreach" param1="cat" param2="information" />
-        <p> <vlc id="value" param1="cat.name" />
-        <ul>
-        <vlc id="foreach" param1="info" param2="cat.info" />
-            <li> <vlc id="value" param1="info.name" />: <vlc id="value" param1="info.value" /> </li>
-        <vlc id="end" />
-        </ul>
-    <vlc id="end" />
-    <hr/>
-    <p><vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/style.css b/share/http/old/style.css
deleted file mode 100644 (file)
index 6e56fb3..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-div {
-    padding: 0px;
-    margin: 0px;
-    border-width: 0px;
-    border-style: none;
-}
-
-/* page body */
-body {
-    font-family: Verdana, Arial, sans-serif;
-    font-size: 10pt;
-    padding: 5pt;
-    margin: 5pt;
-}
-
-/* left column */
-div.left {
-    float: left;
-    width: 19%;
-}
-
-/* main content */
-div.right {
-    float: right;
-    width: 80%;
-}
-
-/* section bloc title */
-div.sectitle {
-    background-color: #5A5ABB;
-    color: #FFFFFF;
-    border: 1px black solid;
-    border-bottom: 0pt black none;
-    font-weight: bold;
-    padding: 0pt 5pt;
-}
-
-/* section bloc content */
-div.section {
-    background-color: #DDDDFF;
-    border: 1px black solid;
-    margin-bottom: 2em;
-    padding: 5pt;
-}
-
-/* section bloc controls */
-div.section-controls {
-    text-align: center;
-    background-color: #DDDDFF;
-    border: 1px black solid;
-    margin-bottom: 2em;
-    padding: 5pt;
-}
-
-/* page title */
-h2.title {
-    text-align: center;
-}
-
-h3 {
-    text-align: left;
-}
-
-table {
-    width: 100%;
-}
-
-table.add {
-    width: 100%;
-}
-
-/* playlist line */
-tr.line1 {
-    background-color: #EEEEFF;
-}
-
-/* playlist line */
-tr.line2 {
-    background-color: #CCCCFF;
-}
-
-/* help text */
-span.small {
-    font-size: 0.9em;
-}
-
-form {
-    margin: 0pt;
-    padding: 0pt;
-}
-
-input {
-    border: 1px solid black;
-}
-
-ul#playlist, ul#playlist ul{
-    list-style-type: none;
-}
diff --git a/share/http/old/vlm/edit.html b/share/http/old/vlm/edit.html
deleted file mode 100644 (file)
index 2b66a28..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
-    <title>VLC media player</title>
-    <link href="../style.css" title="Default" rel="stylesheet" type="text/css" />
-
-    <vlc id="control" param1="vlm_setup,vlm_new,vlm_del,vlm_play,vlm_pause,vlm_stop,vlm_seek,vlm_save,vlm_load" />
-
- </head>
- <body>
-    <h2>
-     <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
-    <div class="sectitle">VLM - Edit <vlc id="value" param1="'name' url_extract"/></div>
-    <div class="section">
-
-<vlc id="foreach" param1="el" param2="vlm" />
-<vlc id="if" param1="'name' url_extract el.name value strcmp 0 =" />
-
-    <vlc id="if" param1="'type' url_extract 'broadcast' strcmp 0 =" />
-        <form method="get" action="/old/vlm/" />
-        <table>
-        <tr><td>Name : </td><td><vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: </td><td>Broadcast </td></tr>
-        <tr><td valign="top">Inputs: </td>
-            <td>
-            <vlc id="foreach" param1="in" param2="el.inputs" /><vlc id="value" param1="in" /><br/><vlc id="end" />
-            <input type="text" name="input" size="40" value=""/><br />
-            </td></tr>
-        <tr><td>Output: </td><td><input type="text" name="output" size="40" value="<vlc id="value" param1="el.output" />"/></td></tr>
-        <tr><td>Option: </td>
-             <td>
-             <vlc id="foreach" param1="op" param2="el.options" /><vlc id="value" param1="op" /><br /><vlc id="end" />
-             <input type="text" name="option" size="40" value=""/><br />
-             </td></tr>
-        </table>
-        <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-        <button name="control" value="vlm_setup">OK</button>
-        </form>
-    <vlc id="else" />
-    <vlc id="if" param1="'type' url_extract 'schedule' strcmp 0 =" />
-        <form method="get" action="/old/vlm/" />
-        <table>
-        <tr><td>Name : </td><td><vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: </td><td>Schedule </td></tr>
-        <tr><td valign="top">Commands: </td>
-            <td><vlc id="foreach" param1="in" param2="el.commands" /><vlc id="value" param1="in" /><br/><vlc id="end" />
-            <input type="text" name="append" size="40" value=""/><br/></td></tr>
-        <tr><td>Date: </td>
-            <td><input type="text" name="date" size="40" value="<vlc id="value" param1="el.date" />"/></td>
-        </tr>
-        <tr><td>Period: </td>
-            <td><input type="text" name="period" size="40" value="<vlc id="value" param1="el.period" />"/></td>
-        </tr>
-        <tr><td>Repeat: </td>
-            <td><input type="text" name="repeat" size="40" value="<vlc id="value" param1="el.repeat" />"/></td>
-        </table>
-        <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-        <button name="control" value="vlm_setup">OK</button>
-        </form>
-    <vlc id="end" />
-    <vlc id="end" />
-<vlc id="end" />
-<vlc id="end" />
-
-    </div>
-
-    <hr/>
-    <p> <vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/vlm/index.html b/share/http/old/vlm/index.html
deleted file mode 100644 (file)
index 8330a91..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
-    <title>VLC media player</title>
-    <link href="../style.css" title="Default" rel="stylesheet" type="text/css" />
-
-    <vlc id="if" param1="url_param"/>
-        <meta http-equiv="refresh" content="0;URL=/old/vlm/" />
-    <vlc id="end" />
-
-    <vlc id="control" param1="vlm_setup,vlm_new,vlm_del,vlm_play,vlm_pause,vlm_stop,vlm_seek,vlm_save,vlm_load" />
- </head>
- <body>
-    <h2>
-     <a href="http://www.videolan.org/">VLC media player <vlc id="value" param1="version" /></a> (http interface)</h2>
-     <h3>
-     The VLM http interface is currently brocken. You should use the telnet interface instead.
-     </h3>
-    <div class="sectitle">VLM - Configuration</div>
-    <div class="section">
-
-    <form method="get" action="" />
-    <input type="test" name="file" size="40"/>
-    <button name="control" value="vlm_load">Load</button>
-    <button name="control" value="vlm_save">Save</button>
-    </form>
-    </div>
-
-    <div class="sectitle">VLM - New</div>
-    <div class="section">
-
-    <form method="get" action="/old/vlm/new.html" />
-    <input type="test" name="name" size="40"/>
-    <input type="submit" name="type" value="broadcast"/>
-    </form>
-
-    <form method="get" action="/old/vlm/new.html" />
-    <input type="test" name="name" size="40"/>
-    <input type="submit" name="type" value="schedule"/>
-    </form>
-    </div>
-
-    <div class="sectitle">VLM - Media</div>
-    <div class="section">
-    <table border="1">
-     <tr class="ligne2">
-      <td>Media</td>
-      <td>State</td>
-      <td>Control</td>
-     </tr>
-<vlc id="foreach" param1="el" param2="vlm" />
-<vlc id="if" param1="el.type value 'broadcast' strcmp 0 = " />
-     <tr>
-      <td>
-       <table>
-        <tr>
-         <td width="30%">
-          <form method="get" action="" />
-           <button name="control" value="vlm_del">del</button>
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-          </form>
-         </td>
-         <td><a href="/old/vlm/show.html?name=<vlc id="value" param1="el.name" />&type=broadcast"><vlc id="value" param1="el.name" /></a></td>
-        </tr>
-       </table>
-      </td>
-      <td>
-<vlc id="if" param1="el.enabled value 'yes' strcmp 0 = " />
-       <table>
-        <tr>
-         <td>
-          <vlc id="foreach" param1="instance" param2="el.instances" />
-           <vlc id="value" param1="instance" />
-          <vlc id="end" />
-         </td>
-         <td align="right">
-          <form method="get" action="" />
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-           <input type="hidden" name="disabled" value="" />
-           <button name="control" value="vlm_setup">disable</button>
-          </form>
-         </td>
-        </tr>
-       </table>
-<vlc id="else" />
-       <table>
-        <tr>
-         <td>disabled</td>
-         <td align="right">
-          <form method="get" action="" />
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-           <input type="hidden" name="enabled" value="" />
-           <button name="control" value="vlm_setup">enable</button>
-          </form>
-         </td>
-        </tr>
-       </table>
-<vlc id="end" />
-      </td>
-      <td>
-<vlc id="if" param1="el.enabled value 'yes' strcmp 0 = " />
-       <form method="get" action="" />
-        <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-         <button name="control" value="vlm_stop">stop</button>
-         <button name="control" value="vlm_play">play</button>
-         <button name="control" value="vlm_pause">pause</button>
-        </form>
-<vlc id="end" />
-      </td>
-     </tr>
-<vlc id="end" />
-<vlc id="end" />
-    </table>
-    </div>
-
-    <div class="sectitle">VLM - Schedule</div>
-    <div class="section">
-    <table border="1">
-     <tr class="ligne2">
-      <td>Schedule</td>
-      <td>State</td>
-     </tr>
-<vlc id="foreach" param1="el" param2="vlm" />
-<vlc id="if" param1="el.type value 'schedule' strcmp 0 = " />
-     <tr>
-      <td>
-       <table>
-        <tr>
-         <td width="30%">
-          <form method="get" action="" />
-           <button name="control" value="vlm_del">del</button>
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-          </form>
-         </td>
-         <td><a href="/old/vlm/show.html?name=<vlc id="value" param1="el.name" />&type=schedule"><vlc id="value" param1="el.name" /></a></td>
-        </tr>
-       </table>
-      </td>
-      <td>
-<vlc id="if" param1="el.enabled value 'yes' strcmp 0 = " />
-       <table>
-        <tr>
-         <td>enabled</td>
-         <td align="right">
-          <form method="get" action="" />
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-           <input type="hidden" name="disabled" value="" />
-           <button name="control" value="vlm_setup">disable</button>
-          </form>
-         </td>
-        </tr>
-       </table>
-<vlc id="else" />
-       <table>
-        <tr>
-         <td>disabled</td>
-         <td align="right">
-          <form method="get" action="" />
-           <input type="hidden" name="name" value="<vlc id="value" param1="el.name" />" />
-           <input type="hidden" name="enabled" value="" />
-           <button name="control" value="vlm_setup">enable</button>
-          </form>
-         </td>
-        </tr>
-       </table>
-<vlc id="end" />
-      </td>
-     </tr>
-<vlc id="end" />
-<vlc id="end" />
-    </table>
-    </div>
-
-    <hr/>
-    <p> <vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/vlm/new.html b/share/http/old/vlm/new.html
deleted file mode 100644 (file)
index 779b520..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
-    <title>VLC media player</title>
-    <link href="../style.css" title="Default" rel="stylesheet" type="text/css" />
-
-    <vlc id="control" param1="vlm_setup,vlm_new,vlm_del,vlm_play,vlm_pause,vlm_stop,vlm_seek,vlm_save,vlm_load" />
-
- </head>
- <body>
-    <h2>
-     <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
-    <div class="sectitle">VLM - New <vlc id="value" param1="'name' url_extract"/></div>
-    <div class="section">
-
-    <vlc id="if" param1="'type' url_extract 'broadcast' strcmp 0 =" />
-        <form method="get" action="/old/vlm/" />
-        <table>
-        <tr><td>Name : <vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: Schedule </td></tr>
-        <tr><td>Input: <input type="text" name="input" size="40" value=""/></td></tr>
-        <tr><td>Output: <input type="text" name="output" size="40" value=""/></td></tr>
-        <tr><td>Option: <input type="text" name="option" size="40" value=""/></td></tr>
-        </table>
-        <input type="hidden" name="disabled" value=""/>
-        <input type="hidden" name="type" value="broadcast"/>
-        <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-        <input type="submit" name="control" value="vlm_new"/>
-        </form>
-    <vlc id="else" />
-    <vlc id="if" param1="'type' url_extract 'schedule' strcmp 0 =" />
-        <form method="get" action="/old/vlm/" />
-        <table>
-        <tr><td>Name : <vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: Schedule </td></tr>
-        <tr><td>Command: <input type="text" name="append" size="40" value=""/></td></tr>
-        <tr><td>Date: <input type="text" name="date" size="40" value=""/></td></tr>
-        <tr><td>Period: <input type="text" name="period" size="40" value=""/></td></tr>
-        <tr><td>Repeat: <input type="text" name="repeat" size="40" value=""/></td></tr>
-        </table>
-        <input type="hidden" name="disabled" value=""/>
-        <input type="hidden" name="type" value="schedule"/>
-        <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-        <input type="submit" name="control" value="vlm_new"/>
-        </form>
-    <vlc id="end" />
-    <vlc id="end" />
-
-    </div>
-    <hr/>
-    <p> <vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/vlm/show.html b/share/http/old/vlm/show.html
deleted file mode 100644 (file)
index 27e99a7..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
- <head>
-    <title>VLC media player</title>
-    <link href="../style.css" title="Default" rel="stylesheet" type="text/css" />
-
-    <vlc id="control" param1="vlm_setup,vlm_new,vlm_del,vlm_play,vlm_pause,vlm_stop,vlm_seek,vlm_save,vlm_load" />
-
- </head>
- <body>
-    <h2>
-     <a href="http://www.videolan.org/">VLC media player<vlc id="value" param1="version" /></a> (http interface)</h2>
-    <div class="sectitle">VLM - Edit <vlc id="value" param1="'name' url_extract"/></div>
-    <div class="section">
-
-<vlc id="foreach" param1="el" param2="vlm" />
-<vlc id="if" param1="'name' url_extract el.name value strcmp 0 =" />
-
-    <vlc id="if" param1="'type' url_extract 'broadcast' strcmp 0 =" />
-        <table>
-        <tr><td>Name : </td><td><vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: </td><td>Broadcast </td></tr>
-        <tr><td valign="top">Inputs: </td>
-            <td>
-            <vlc id="foreach" param1="in" param2="el.inputs" /><vlc id="value" param1="in" /><br/><vlc id="end" />
-            </td></tr>
-        <tr><td>Output: </td><td><vlc id="value" param1="el.output" /></td></tr>
-        <tr><td>Option: </td>
-             <td>
-             <vlc id="foreach" param1="op" param2="el.options" /><vlc id="value" param1="op" /><br/><vlc id="end" />
-             </td></tr>
-        </table>
-        <form method="get" action="/old/vlm/edit.html" />
-         <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-         <input type="hidden" name="type" value="broadcast" />
-         <button name="control" value="vlm_setup">setup</button>
-        </form>
-    <vlc id="else" />
-    <vlc id="if" param1="'type' url_extract 'schedule' strcmp 0 =" />
-        <table>
-        <tr><td>Name : </td><td><vlc id="value" param1="'name' url_extract"/> </td> </tr>
-        <tr><td>Type: </td><td>Schedule </td></tr>
-        <tr><td valign="top">Commands: </td>
-            <td><vlc id="foreach" param1="in" param2="el.commands" /><vlc id="value" param1="in" /><br/><vlc id="end" />
-            </td></tr>
-        <tr><td>Date: </td>
-            <td><vlc id="value" param1="el.date" /></td>
-        </tr>
-<vlc id="if" param1="el.period value '0' strcmp" />
-        <tr>
-         <td>Period: </td>
-         <td><vlc id="value" param1="el.period" /></td>
-        </tr>
-        <tr>
-         <td>Repeat: </td>
-<vlc id="if" param1="el.repeat value "-1" strcmp" />
-         <td><vlc id="value" param1="el.repeat" /></td>
-<vlc id="else" />
-         Endless
-<vlc id="end" />
-        </tr>
-<vlc id="end" />
-        </table>
-        <form method="get" action="/old/vlm/edit.html" />
-         <input type="hidden" name="name" value="<vlc id="value" param1="'name' url_extract"/>" />
-         <input type="hidden" name="type" value="schedule" />
-         <button name="control" value="vlm_setup">setup</button>
-        </form>
-    <vlc id="end" />
-    <vlc id="end" />
-<vlc id="end" />
-<vlc id="end" />
-
-    </div>
-
-    <hr/>
-    <p> <vlc id="value" param1="copyright" /> </p>
-</body>
-</html>
diff --git a/share/http/old/webcam.html b/share/http/old/webcam.html
deleted file mode 100644 (file)
index a94b0a7..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD  XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml10/DTD/xhtml10transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-       <head>
-               <title>VideoLAN browser output</title>
-               <link href="style.css" title="Default" rel="stylesheet" type="text/css" />
-       </head>
-<body>
-<p>
-This is an example webpage for viewing a Multipart MJPEG stream from any browser. You should edit it to point to the URL of your MPJEG stream that you are streaming with VLC or with a AXIS webcam for instance. For setting up such a stream, refer to the <a href="http://www.videolan.org/doc">VideoLAN HOWTO</a>.</p>
-<p>The page has two modes. A Netscape browser compatible mode which will directly show the videostream, and a mode in which it uses a Java Applet. This is because many browsers cannot handle live MJPEG streams. The Applet in use is the <a href="http://www.charliemouse.com/code/cambozola">Cambozola</a> plugin. You will need to download it from the Cambozola website and put it in the same directory as this webpage.</p>
-
-<h1>Netscape style</h1>
-<a href="http://vlc.server.org:8080/thestream">Click Here</a><br />
-
-<h1>Java applet style</h1>
-<applet code="com.charliemouse.cambozola.Viewer" archive="cambozola.jar" width="320" height="240">
-<param name="url" value="http://vlc.server.org:8080/thestream">
-<param name="properties" value="none">
-</applet>
-
-</body>
-</html>