Fix lua http interface loading.

diff --git a/Makefile.am b/Makefile.am
index d5fa56857c5fb47928cddff699c982c50b56d51b..939a151affc8400db817f8391c4c8b266b59fb3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -440,39 +440,39 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
-       $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
-       for i in $(srcdir)/share/http-lua/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests
+       $(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts
+       for i in $(srcdir)/share/lua/http/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/dialogs/* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/dialogs/* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/js/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/js/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/old/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/old/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/old/admin/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/old/vlm/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/images/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/images/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \
        done
-       for i in $(srcdir)/share/http-lua/requests/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
+       for i in $(srcdir)/share/lua/http/requests/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
        done
-       $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
+       $(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
@@ -655,42 +655,42 @@ package-win-common:
             || true ; \
        done
 
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin"
-       cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ;
-       cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ;
-       cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ;
-       cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ;
-       cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ;
-       cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ;
-       cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-       cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/
-       cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ;
-       cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-
-       cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ;
-       cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-       cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-       cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-       cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ;
-       cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ;
-       cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/admin"
+       cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.html ;
+       cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/.hosts ;
+       cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.css ;
+       cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/lua/http/js/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/js/*.js ;
+       cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/* ;
+       cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/.hosts ;
+       cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+       cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/images/
+       cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/lua/http/requests/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
+       cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+
+       cp $(srcdir)/share/lua/http/old/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/*.html ;
+       cp $(srcdir)/share/lua/http/old/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+       cp $(srcdir)/share/lua/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+       cp $(srcdir)/share/lua/http/old/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+       cp $(srcdir)/share/lua/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/*.html ;
+       cp $(srcdir)/share/lua/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
+       unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/*.html ;
+       cp $(srcdir)/share/lua/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
 
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"

diff --git a/share/Makefile.am b/share/Makefile.am
index 5d69a9485569e01330bf7b39b03fd91b2ba7d490..df53119ece64005c175a45f8343c0eda664b3947 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -274,86 +274,86 @@ DIST_lua= \
        lua/intf/dummy.lua
 
 DIST_http_lua = \
-       http-lua/.hosts \
-       http-lua/custom.lua \
-       http-lua/dialogs/.hosts \
-       http-lua/dialogs/browse \
-       http-lua/dialogs/footer \
-       http-lua/dialogs/input \
-       http-lua/dialogs/main \
-       http-lua/dialogs/mosaic \
-       http-lua/dialogs/playlist \
-       http-lua/dialogs/sout \
-       http-lua/dialogs/vlm \
-       http-lua/favicon.ico \
-       http-lua/images/delete.png \
-       http-lua/images/delete_small.png \
-       http-lua/images/eject.png \
-       http-lua/images/empty.png \
-       http-lua/images/fullscreen.png \
-       http-lua/images/help.png \
-       http-lua/images/info.png \
-       http-lua/images/loop.png \
-       http-lua/images/minus.png \
-       http-lua/images/next.png \
-       http-lua/images/pause.png \
-       http-lua/images/play.png \
-       http-lua/images/playlist.png \
-       http-lua/images/playlist_small.png \
-       http-lua/images/plus.png \
-       http-lua/images/prev.png \
-       http-lua/images/refresh.png \
-       http-lua/images/repeat.png \
-       http-lua/images/reset.png \
-       http-lua/images/sd.png \
-       http-lua/images/shuffle.png \
-       http-lua/images/slider_bar.png \
-       http-lua/images/slider_left.png \
-       http-lua/images/slider_point.png \
-       http-lua/images/slider_right.png \
-       http-lua/images/snapshot.png \
-       http-lua/images/slow.png \
-       http-lua/images/sort.png \
-       http-lua/images/sout.png \
-       http-lua/images/speaker.png \
-       http-lua/images/speaker_mute.png \
-       http-lua/images/stop.png \
-       http-lua/images/vlc16x16.png \
-       http-lua/images/volume_down.png \
-       http-lua/images/volume_up.png \
-       http-lua/images/white.png \
-       http-lua/images/white_cross_small.png \
-       http-lua/index.html \
-       http-lua/js/functions.js \
-       http-lua/js/mosaic.js \
-       http-lua/js/vlm.js \
-       http-lua/mosaic.html \
-       http-lua/old/.hosts \
-       http-lua/old/admin/.access \
-       http-lua/old/admin/browse.html \
-       http-lua/old/admin/dboxfiles.html \
-       http-lua/old/admin/index.html \
-       http-lua/old/cone_minus.png \
-       http-lua/old/cone_plus.png \
-       http-lua/old/index.html \
-       http-lua/old/info.html \
-       http-lua/old/style.css \
-       http-lua/old/vlm/edit.html \
-       http-lua/old/vlm/index.html \
-       http-lua/old/vlm/new.html \
-       http-lua/old/vlm/show.html \
-       http-lua/old/webcam.html \
-       http-lua/requests/browse.xml \
-       http-lua/requests/playlist.xml \
-       http-lua/requests/status.xml \
-       http-lua/requests/vlm.xml \
-       http-lua/requests/vlm_cmd.xml \
-       http-lua/requests/readme \
-       http-lua/style.css \
-       http-lua/iehacks.css \
-       http-lua/vlm.html \
-       http-lua/vlm_export.html \
-       http-lua/flash.html
+       lua/http/.hosts \
+       lua/http/custom.lua \
+       lua/http/dialogs/.hosts \
+       lua/http/dialogs/browse \
+       lua/http/dialogs/footer \
+       lua/http/dialogs/input \
+       lua/http/dialogs/main \
+       lua/http/dialogs/mosaic \
+       lua/http/dialogs/playlist \
+       lua/http/dialogs/sout \
+       lua/http/dialogs/vlm \
+       lua/http/favicon.ico \
+       lua/http/images/delete.png \
+       lua/http/images/delete_small.png \
+       lua/http/images/eject.png \
+       lua/http/images/empty.png \
+       lua/http/images/fullscreen.png \
+       lua/http/images/help.png \
+       lua/http/images/info.png \
+       lua/http/images/loop.png \
+       lua/http/images/minus.png \
+       lua/http/images/next.png \
+       lua/http/images/pause.png \
+       lua/http/images/play.png \
+       lua/http/images/playlist.png \
+       lua/http/images/playlist_small.png \
+       lua/http/images/plus.png \
+       lua/http/images/prev.png \
+       lua/http/images/refresh.png \
+       lua/http/images/repeat.png \
+       lua/http/images/reset.png \
+       lua/http/images/sd.png \
+       lua/http/images/shuffle.png \
+       lua/http/images/slider_bar.png \
+       lua/http/images/slider_left.png \
+       lua/http/images/slider_point.png \
+       lua/http/images/slider_right.png \
+       lua/http/images/snapshot.png \
+       lua/http/images/slow.png \
+       lua/http/images/sort.png \
+       lua/http/images/sout.png \
+       lua/http/images/speaker.png \
+       lua/http/images/speaker_mute.png \
+       lua/http/images/stop.png \
+       lua/http/images/vlc16x16.png \
+       lua/http/images/volume_down.png \
+       lua/http/images/volume_up.png \
+       lua/http/images/white.png \
+       lua/http/images/white_cross_small.png \
+       lua/http/index.html \
+       lua/http/js/functions.js \
+       lua/http/js/mosaic.js \
+       lua/http/js/vlm.js \
+       lua/http/mosaic.html \
+       lua/http/old/.hosts \
+       lua/http/old/admin/.access \
+       lua/http/old/admin/browse.html \
+       lua/http/old/admin/dboxfiles.html \
+       lua/http/old/admin/index.html \
+       lua/http/old/cone_minus.png \
+       lua/http/old/cone_plus.png \
+       lua/http/old/index.html \
+       lua/http/old/info.html \
+       lua/http/old/style.css \
+       lua/http/old/vlm/edit.html \
+       lua/http/old/vlm/index.html \
+       lua/http/old/vlm/new.html \
+       lua/http/old/vlm/show.html \
+       lua/http/old/webcam.html \
+       lua/http/requests/browse.xml \
+       lua/http/requests/playlist.xml \
+       lua/http/requests/status.xml \
+       lua/http/requests/vlm.xml \
+       lua/http/requests/vlm_cmd.xml \
+       lua/http/requests/readme \
+       lua/http/style.css \
+       lua/http/iehacks.css \
+       lua/http/vlm.html \
+       lua/http/vlm_export.html \
+       lua/http/flash.html
 
 DIST_mozilla = \
        mozilla/fullscreen.xpm \

diff --git a/share/http-lua/.hosts b/share/lua/http/.hosts
similarity index 100%
rename from share/http-lua/.hosts
rename to share/lua/http/.hosts

diff --git a/share/http-lua/custom.lua b/share/lua/http/custom.lua
similarity index 100%
rename from share/http-lua/custom.lua
rename to share/lua/http/custom.lua

diff --git a/share/http-lua/dialogs/.hosts b/share/lua/http/dialogs/.hosts
similarity index 100%
rename from share/http-lua/dialogs/.hosts
rename to share/lua/http/dialogs/.hosts

diff --git a/share/http-lua/dialogs/browse b/share/lua/http/dialogs/browse
similarity index 100%
rename from share/http-lua/dialogs/browse
rename to share/lua/http/dialogs/browse

diff --git a/share/http-lua/dialogs/footer b/share/lua/http/dialogs/footer
similarity index 100%
rename from share/http-lua/dialogs/footer
rename to share/lua/http/dialogs/footer

diff --git a/share/http-lua/dialogs/input b/share/lua/http/dialogs/input
similarity index 100%
rename from share/http-lua/dialogs/input
rename to share/lua/http/dialogs/input

diff --git a/share/http-lua/dialogs/main b/share/lua/http/dialogs/main
similarity index 100%
rename from share/http-lua/dialogs/main
rename to share/lua/http/dialogs/main

diff --git a/share/http-lua/dialogs/mosaic b/share/lua/http/dialogs/mosaic
similarity index 100%
rename from share/http-lua/dialogs/mosaic
rename to share/lua/http/dialogs/mosaic

diff --git a/share/http-lua/dialogs/playlist b/share/lua/http/dialogs/playlist
similarity index 100%
rename from share/http-lua/dialogs/playlist
rename to share/lua/http/dialogs/playlist

diff --git a/share/http-lua/dialogs/sout b/share/lua/http/dialogs/sout
similarity index 100%
rename from share/http-lua/dialogs/sout
rename to share/lua/http/dialogs/sout

diff --git a/share/http-lua/dialogs/vlm b/share/lua/http/dialogs/vlm
similarity index 100%
rename from share/http-lua/dialogs/vlm
rename to share/lua/http/dialogs/vlm

diff --git a/share/http-lua/favicon.ico b/share/lua/http/favicon.ico
similarity index 100%
rename from share/http-lua/favicon.ico
rename to share/lua/http/favicon.ico

diff --git a/share/http-lua/flash.html b/share/lua/http/flash.html
similarity index 100%
rename from share/http-lua/flash.html
rename to share/lua/http/flash.html

diff --git a/share/http-lua/iehacks.css b/share/lua/http/iehacks.css
similarity index 100%
rename from share/http-lua/iehacks.css
rename to share/lua/http/iehacks.css

diff --git a/share/http-lua/images/delete.png b/share/lua/http/images/delete.png
similarity index 100%
rename from share/http-lua/images/delete.png
rename to share/lua/http/images/delete.png

diff --git a/share/http-lua/images/delete_small.png b/share/lua/http/images/delete_small.png
similarity index 100%
rename from share/http-lua/images/delete_small.png
rename to share/lua/http/images/delete_small.png

diff --git a/share/http-lua/images/eject.png b/share/lua/http/images/eject.png
similarity index 100%
rename from share/http-lua/images/eject.png
rename to share/lua/http/images/eject.png

diff --git a/share/http-lua/images/empty.png b/share/lua/http/images/empty.png
similarity index 100%
rename from share/http-lua/images/empty.png
rename to share/lua/http/images/empty.png

diff --git a/share/http-lua/images/fullscreen.png b/share/lua/http/images/fullscreen.png
similarity index 100%
rename from share/http-lua/images/fullscreen.png
rename to share/lua/http/images/fullscreen.png

diff --git a/share/http-lua/images/help.png b/share/lua/http/images/help.png
similarity index 100%
rename from share/http-lua/images/help.png
rename to share/lua/http/images/help.png

diff --git a/share/http-lua/images/info.png b/share/lua/http/images/info.png
similarity index 100%
rename from share/http-lua/images/info.png
rename to share/lua/http/images/info.png

diff --git a/share/http-lua/images/loop.png b/share/lua/http/images/loop.png
similarity index 100%
rename from share/http-lua/images/loop.png
rename to share/lua/http/images/loop.png

diff --git a/share/http-lua/images/minus.png b/share/lua/http/images/minus.png
similarity index 100%
rename from share/http-lua/images/minus.png
rename to share/lua/http/images/minus.png

diff --git a/share/http-lua/images/next.png b/share/lua/http/images/next.png
similarity index 100%
rename from share/http-lua/images/next.png
rename to share/lua/http/images/next.png

diff --git a/share/http-lua/images/pause.png b/share/lua/http/images/pause.png
similarity index 100%
rename from share/http-lua/images/pause.png
rename to share/lua/http/images/pause.png

diff --git a/share/http-lua/images/play.png b/share/lua/http/images/play.png
similarity index 100%
rename from share/http-lua/images/play.png
rename to share/lua/http/images/play.png

diff --git a/share/http-lua/images/playlist.png b/share/lua/http/images/playlist.png
similarity index 100%
rename from share/http-lua/images/playlist.png
rename to share/lua/http/images/playlist.png

diff --git a/share/http-lua/images/playlist_small.png b/share/lua/http/images/playlist_small.png
similarity index 100%
rename from share/http-lua/images/playlist_small.png
rename to share/lua/http/images/playlist_small.png

diff --git a/share/http-lua/images/plus.png b/share/lua/http/images/plus.png
similarity index 100%
rename from share/http-lua/images/plus.png
rename to share/lua/http/images/plus.png

diff --git a/share/http-lua/images/prev.png b/share/lua/http/images/prev.png
similarity index 100%
rename from share/http-lua/images/prev.png
rename to share/lua/http/images/prev.png

diff --git a/share/http-lua/images/refresh.png b/share/lua/http/images/refresh.png
similarity index 100%
rename from share/http-lua/images/refresh.png
rename to share/lua/http/images/refresh.png

diff --git a/share/http-lua/images/repeat.png b/share/lua/http/images/repeat.png
similarity index 100%
rename from share/http-lua/images/repeat.png
rename to share/lua/http/images/repeat.png

diff --git a/share/http-lua/images/reset.png b/share/lua/http/images/reset.png
similarity index 100%
rename from share/http-lua/images/reset.png
rename to share/lua/http/images/reset.png

diff --git a/share/http-lua/images/sd.png b/share/lua/http/images/sd.png
similarity index 100%
rename from share/http-lua/images/sd.png
rename to share/lua/http/images/sd.png

diff --git a/share/http-lua/images/shuffle.png b/share/lua/http/images/shuffle.png
similarity index 100%
rename from share/http-lua/images/shuffle.png
rename to share/lua/http/images/shuffle.png

diff --git a/share/http-lua/images/slider_bar.png b/share/lua/http/images/slider_bar.png
similarity index 100%
rename from share/http-lua/images/slider_bar.png
rename to share/lua/http/images/slider_bar.png

diff --git a/share/http-lua/images/slider_left.png b/share/lua/http/images/slider_left.png
similarity index 100%
rename from share/http-lua/images/slider_left.png
rename to share/lua/http/images/slider_left.png

diff --git a/share/http-lua/images/slider_point.png b/share/lua/http/images/slider_point.png
similarity index 100%
rename from share/http-lua/images/slider_point.png
rename to share/lua/http/images/slider_point.png

diff --git a/share/http-lua/images/slider_right.png b/share/lua/http/images/slider_right.png
similarity index 100%
rename from share/http-lua/images/slider_right.png
rename to share/lua/http/images/slider_right.png

diff --git a/share/http-lua/images/slow.png b/share/lua/http/images/slow.png
similarity index 100%
rename from share/http-lua/images/slow.png
rename to share/lua/http/images/slow.png

diff --git a/share/http-lua/images/snapshot.png b/share/lua/http/images/snapshot.png
similarity index 100%
rename from share/http-lua/images/snapshot.png
rename to share/lua/http/images/snapshot.png

diff --git a/share/http-lua/images/sort.png b/share/lua/http/images/sort.png
similarity index 100%
rename from share/http-lua/images/sort.png
rename to share/lua/http/images/sort.png

diff --git a/share/http-lua/images/sout.png b/share/lua/http/images/sout.png
similarity index 100%
rename from share/http-lua/images/sout.png
rename to share/lua/http/images/sout.png

diff --git a/share/http-lua/images/speaker.png b/share/lua/http/images/speaker.png
similarity index 100%
rename from share/http-lua/images/speaker.png
rename to share/lua/http/images/speaker.png

diff --git a/share/http-lua/images/speaker_mute.png b/share/lua/http/images/speaker_mute.png
similarity index 100%
rename from share/http-lua/images/speaker_mute.png
rename to share/lua/http/images/speaker_mute.png

diff --git a/share/http-lua/images/stop.png b/share/lua/http/images/stop.png
similarity index 100%
rename from share/http-lua/images/stop.png
rename to share/lua/http/images/stop.png

diff --git a/share/http-lua/images/vlc16x16.png b/share/lua/http/images/vlc16x16.png
similarity index 100%
rename from share/http-lua/images/vlc16x16.png
rename to share/lua/http/images/vlc16x16.png

diff --git a/share/http-lua/images/volume_down.png b/share/lua/http/images/volume_down.png
similarity index 100%
rename from share/http-lua/images/volume_down.png
rename to share/lua/http/images/volume_down.png

diff --git a/share/http-lua/images/volume_up.png b/share/lua/http/images/volume_up.png
similarity index 100%
rename from share/http-lua/images/volume_up.png
rename to share/lua/http/images/volume_up.png

diff --git a/share/http-lua/images/white.png b/share/lua/http/images/white.png
similarity index 100%
rename from share/http-lua/images/white.png
rename to share/lua/http/images/white.png

diff --git a/share/http-lua/images/white_cross_small.png b/share/lua/http/images/white_cross_small.png
similarity index 100%
rename from share/http-lua/images/white_cross_small.png
rename to share/lua/http/images/white_cross_small.png

diff --git a/share/http-lua/index.html b/share/lua/http/index.html
similarity index 100%
rename from share/http-lua/index.html
rename to share/lua/http/index.html

diff --git a/share/http-lua/js/functions.js b/share/lua/http/js/functions.js
similarity index 100%
rename from share/http-lua/js/functions.js
rename to share/lua/http/js/functions.js

diff --git a/share/http-lua/js/mosaic.js b/share/lua/http/js/mosaic.js
similarity index 100%
rename from share/http-lua/js/mosaic.js
rename to share/lua/http/js/mosaic.js

diff --git a/share/http-lua/js/vlm.js b/share/lua/http/js/vlm.js
similarity index 100%
rename from share/http-lua/js/vlm.js
rename to share/lua/http/js/vlm.js

diff --git a/share/http-lua/mosaic.html b/share/lua/http/mosaic.html
similarity index 100%
rename from share/http-lua/mosaic.html
rename to share/lua/http/mosaic.html

diff --git a/share/http-lua/old/.hosts b/share/lua/http/old/.hosts
similarity index 100%
rename from share/http-lua/old/.hosts
rename to share/lua/http/old/.hosts

diff --git a/share/http-lua/old/admin/.access b/share/lua/http/old/admin/.access
similarity index 100%
rename from share/http-lua/old/admin/.access
rename to share/lua/http/old/admin/.access

diff --git a/share/http-lua/old/admin/browse.html b/share/lua/http/old/admin/browse.html
similarity index 100%
rename from share/http-lua/old/admin/browse.html
rename to share/lua/http/old/admin/browse.html

diff --git a/share/http-lua/old/admin/dboxfiles.html b/share/lua/http/old/admin/dboxfiles.html
similarity index 100%
rename from share/http-lua/old/admin/dboxfiles.html
rename to share/lua/http/old/admin/dboxfiles.html

diff --git a/share/http-lua/old/admin/index.html b/share/lua/http/old/admin/index.html
similarity index 100%
rename from share/http-lua/old/admin/index.html
rename to share/lua/http/old/admin/index.html

diff --git a/share/http-lua/old/cone_minus.png b/share/lua/http/old/cone_minus.png
similarity index 100%
rename from share/http-lua/old/cone_minus.png
rename to share/lua/http/old/cone_minus.png

diff --git a/share/http-lua/old/cone_plus.png b/share/lua/http/old/cone_plus.png
similarity index 100%
rename from share/http-lua/old/cone_plus.png
rename to share/lua/http/old/cone_plus.png

diff --git a/share/http-lua/old/index.html b/share/lua/http/old/index.html
similarity index 100%
rename from share/http-lua/old/index.html
rename to share/lua/http/old/index.html

diff --git a/share/http-lua/old/info.html b/share/lua/http/old/info.html
similarity index 100%
rename from share/http-lua/old/info.html
rename to share/lua/http/old/info.html

diff --git a/share/http-lua/old/style.css b/share/lua/http/old/style.css
similarity index 100%
rename from share/http-lua/old/style.css
rename to share/lua/http/old/style.css

diff --git a/share/http-lua/old/vlm/edit.html b/share/lua/http/old/vlm/edit.html
similarity index 100%
rename from share/http-lua/old/vlm/edit.html
rename to share/lua/http/old/vlm/edit.html

diff --git a/share/http-lua/old/vlm/index.html b/share/lua/http/old/vlm/index.html
similarity index 100%
rename from share/http-lua/old/vlm/index.html
rename to share/lua/http/old/vlm/index.html

diff --git a/share/http-lua/old/vlm/new.html b/share/lua/http/old/vlm/new.html
similarity index 100%
rename from share/http-lua/old/vlm/new.html
rename to share/lua/http/old/vlm/new.html

diff --git a/share/http-lua/old/vlm/show.html b/share/lua/http/old/vlm/show.html
similarity index 100%
rename from share/http-lua/old/vlm/show.html
rename to share/lua/http/old/vlm/show.html

diff --git a/share/http-lua/old/webcam.html b/share/lua/http/old/webcam.html
similarity index 100%
rename from share/http-lua/old/webcam.html
rename to share/lua/http/old/webcam.html

diff --git a/share/http-lua/requests/browse.xml b/share/lua/http/requests/browse.xml
similarity index 100%
rename from share/http-lua/requests/browse.xml
rename to share/lua/http/requests/browse.xml

diff --git a/share/http-lua/requests/playlist.xml b/share/lua/http/requests/playlist.xml
similarity index 100%
rename from share/http-lua/requests/playlist.xml
rename to share/lua/http/requests/playlist.xml

diff --git a/share/http-lua/requests/readme b/share/lua/http/requests/readme
similarity index 100%
rename from share/http-lua/requests/readme
rename to share/lua/http/requests/readme

diff --git a/share/http-lua/requests/status.xml b/share/lua/http/requests/status.xml
similarity index 100%
rename from share/http-lua/requests/status.xml
rename to share/lua/http/requests/status.xml

diff --git a/share/http-lua/requests/vlm.xml b/share/lua/http/requests/vlm.xml
similarity index 100%
rename from share/http-lua/requests/vlm.xml
rename to share/lua/http/requests/vlm.xml

diff --git a/share/http-lua/requests/vlm_cmd.xml b/share/lua/http/requests/vlm_cmd.xml
similarity index 100%
rename from share/http-lua/requests/vlm_cmd.xml
rename to share/lua/http/requests/vlm_cmd.xml

diff --git a/share/http-lua/style.css b/share/lua/http/style.css
similarity index 100%
rename from share/http-lua/style.css
rename to share/lua/http/style.css

diff --git a/share/http-lua/vlm.html b/share/lua/http/vlm.html
similarity index 100%
rename from share/http-lua/vlm.html
rename to share/lua/http/vlm.html

diff --git a/share/http-lua/vlm_export.html b/share/lua/http/vlm_export.html
similarity index 100%
rename from share/http-lua/vlm_export.html
rename to share/lua/http/vlm_export.html

diff --git a/share/lua/intf/http.lua b/share/lua/intf/http.lua
index 1e6d775dc61642f2b00dc0bb7ce04902aad61795..2c2cd1bbe037da4b248d311765147f086da91a8b 100644 (file)
--- a/share/lua/intf/http.lua
+++ b/share/lua/intf/http.lua
@@ -190,7 +190,7 @@ local function find_datadir(name)
     end
     error("Unable to find the `"..name.."' directory.")
 end
-http_dir = config.dir or find_datadir("http-lua")
+http_dir = config.dir or find_datadir("http")
 
 do
     local oldpath = package.path