From: Derk-Jan Hartman Date: Fri, 12 Jun 2009 14:18:29 +0000 (+0200) Subject: http: Removing the old http interface. X-Git-Tag: 1.1.0-ff~5477 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ad16fc374f913a87dd725f93adf7d3759349ba2f;p=vlc http: Removing the old http interface. This closes #1395 --- diff --git a/Makefile.am b/Makefile.am index 5de28caa73..405d454972 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/share/Makefile.am b/share/Makefile.am index 3abf2d146f..6379fed67b 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -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 index 6f54ae01b6..0000000000 --- a/share/http/old/.hosts +++ /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 index 8a5c9a6663..0000000000 --- a/share/http/old/admin/.access +++ /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 index 9eb5057fde..0000000000 --- a/share/http/old/admin/browse.html +++ /dev/null @@ -1,51 +0,0 @@ - - - VLC media player - Browser - - - - " /> - - - - - -

VLC media player

-
- - - - - - -

This page is default disabled for security reasons (change _directory_ into directory to enable it).

- - - - - line1line2"> - - - - - - -
File ()SizeDate
- - [DIR]" - "> - - [FILE]" - - - -
- "/> - "/> - -
-
-
-

- - diff --git a/share/http/old/admin/dboxfiles.html b/share/http/old/admin/dboxfiles.html deleted file mode 100644 index e9d0f7ba02..0000000000 --- a/share/http/old/admin/dboxfiles.html +++ /dev/null @@ -1,2 +0,0 @@ -DIR: - \ 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 index 0641f098a5..0000000000 --- a/share/http/old/admin/index.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - VLC media player - - - - - - - - - -

VLC media player - Admin

- -
Shutdown VLC
- -
Host list
-
- - - - - - - - - - - - -
IdHostIPPort
-
- -
File list
-
- - - - - - - - - - - - - - - -
IdURLMimeProtectedUsage
-
- - -
Stream list
-
- - - - - - - - - - - - - - - -
IdURLMimeProtectedUsage
-
- -
Connections list
-
- - - - - - - - - - - - - -
IdipURLStatusActions
-
- "/> - -
- -
-
-
-

- - - diff --git a/share/http/old/cone_minus.png b/share/http/old/cone_minus.png deleted file mode 100644 index b7a75e77ae..0000000000 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 index d093904ef6..0000000000 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 index 60363778d0..0000000000 --- a/share/http/old/index.html +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - VLC media player - - - - - - - - - - - - - - - - - - -
-
Playback control
-
-

-

- -
-
- -
-

-

-

- -
-
- -
-

-

-

- -
-
- -
-

-

-

- - -
-

-

- ( Seek Textbox: for example "+12min 42sec", "01:13:43", "-12%" etc... ) -

-
- -
Misc controls
-
-
- - Vol: -
(0 - 1024)
(for example: "536", "-12", "+42", "36%") -
-
-
- -
-
- -
Status
-
- State:
- Length: s -
- Time: s
- Volume: -
Information -
- -
Administration Page
- -
- - - -
-

VLC media player - (http interface) -

- -
Add
-
- - - - - - - - - - - - - -
Add a MRL (Media Resource Locator) to the playlist - - - -
Stream Output: - " /> - -
-
- -
-
-
    - - - - - - -
- - - - - -
  • - "/> - - - - "> - () - - - -
    • - -
  • - - Cone - Playlist - - - [-] - - "/> - "> - - - - - - ( - items) - - - -
      - - - - - - - - - - - -
    • - - - - - - - by - with - - - -
    -
    - - -

    - - - - diff --git a/share/http/old/info.html b/share/http/old/info.html deleted file mode 100644 index 12cbadaae1..0000000000 --- a/share/http/old/info.html +++ /dev/null @@ -1,19 +0,0 @@ - - - VLC media player - Information - - -

    VLC media player

    -
    - -

    -

      - -
    • :
      • - -
    - -
    -

    - - diff --git a/share/http/old/style.css b/share/http/old/style.css deleted file mode 100644 index 6e56fb3b3c..0000000000 --- a/share/http/old/style.css +++ /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 index 2b66a280b2..0000000000 --- a/share/http/old/vlm/edit.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - VLC media player - - - - - - -

    - VLC media player (http interface)

    -
    VLM - Edit
    -
    - - - - - -
    - - - - - - - - -
    Name :
    Type: Broadcast
    Inputs: -
    -
    -
    Output: "/>
    Option: -
    -
    -
    - " /> - -
    - - -
    - - - - - - - - - - - - - -
    Name :
    Type: Schedule
    Commands:
    -
    Date: "/>
    Period: "/>
    Repeat: "/>
    - " /> - -
    - - - - - -
    - -
    -

    - - diff --git a/share/http/old/vlm/index.html b/share/http/old/vlm/index.html deleted file mode 100644 index 8330a91de8..0000000000 --- a/share/http/old/vlm/index.html +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - VLC media player - - - - - - - - - -

    - VLC media player (http interface)

    -

    - The VLM http interface is currently brocken. You should use the telnet interface instead. -

    -
    VLM - Configuration
    -
    - -
    - - - -
    -
    - -
    VLM - New
    -
    - -
    - - -
    - -
    - - -
    -
    - -
    VLM - Media
    -
    - - - - - - - - - - - - - - - -
    MediaStateControl
    - - - - - -
    -
    - - " /> -
    -     		&type=broadcast">
    -     		- - - - - - -
    - - - - -
    - " /> - - -
    -
    - - - - - - -
    disabled -
    - " /> - - -
    -
    - -     		- -
    - " /> - - - -
    - -
    -
    - -
    VLM - Schedule
    -
    - - - - - - - - - - - - - -
    ScheduleState
    - - - - - -
    -
    - - " /> -
    -     		&type=schedule">
    -     		- - - - - - -
    enabled -
    - " /> - - -
    -
    - - - - - - -
    disabled -
    - " /> - - -
    -
    - -
    -
    - -
    -

    - - diff --git a/share/http/old/vlm/new.html b/share/http/old/vlm/new.html deleted file mode 100644 index 779b52073c..0000000000 --- a/share/http/old/vlm/new.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - VLC media player - - - - - - -

    - VLC media player (http interface)

    -
    VLM - New
    -
    - - -
    - - - - - - -
    Name :
    Type: Schedule
    Input:
    Output:
    Option:
    - - - " /> - -
    - - -
    - - - - - - - -
    Name :
    Type: Schedule
    Command:
    Date:
    Period:
    Repeat:
    - - - " /> - -
    - - - -
    -
    -

    - - diff --git a/share/http/old/vlm/show.html b/share/http/old/vlm/show.html deleted file mode 100644 index 27e99a7ac9..0000000000 --- a/share/http/old/vlm/show.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - VLC media player - - - - - - -

    - VLC media player (http interface)

    -
    VLM - Edit
    -
    - - - - - - - - - - - - - -
    Name :
    Type: Broadcast
    Inputs: -
    -
    Output:
    Option: -
    -
    -
    - " /> - - -
    - - - - - - - - - - - - - - - - - - - - - Endless - - - -
    Name :
    Type: Schedule
    Commands:
    -
    Date:
    Period:
    Repeat:
    -
    - " /> - - -
    - - - - - -
    - -
    -

    - - diff --git a/share/http/old/webcam.html b/share/http/old/webcam.html deleted file mode 100644 index a94b0a70b0..0000000000 --- a/share/http/old/webcam.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - VideoLAN browser output - - - -

    -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 VideoLAN HOWTO.

    -

    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 Cambozola plugin. You will need to download it from the Cambozola website and put it in the same directory as this webpage.

    - -

    Netscape style

    -Click Here
    - -

    Java applet style

    - - - - - - -