Fixes for prehistoric build system

diff --git a/Makefile.am b/Makefile.am
index 12010f09744b33451ca58035cedaeeefdc1e606e..a2aeadc89ba98bfd349145db5d25a5d668429544 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -878,6 +878,9 @@ package-win32-base:
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
@@ -891,6 +894,16 @@ package-win32-base:
        cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
+       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
+       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
+       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
+
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
@@ -985,6 +998,9 @@ package-wince-base:
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
@@ -998,6 +1014,16 @@ package-wince-base:
        cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
+       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
+       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
+       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
+
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 if BUILD_MOZILLA

diff --git a/modules/gui/wxwidgets/dialogs/fileinfo.cpp b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
index 21e121d657a60ba9e69183f417d14e427f5eba93..22341b4f0f8008dc922a737a2bf1472009cd2aab 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -107,9 +107,7 @@ void FileInfo::Update()
                                                  FIND_ANYWHERE );
     if( !p_playlist ) return;
 
-    input_thread_t *p_input =
-        (input_thread_t *)vlc_object_find( p_playlist, VLC_OBJECT_INPUT,
-                                           FIND_CHILD );
+    input_thread_t *p_input = p_playlist->p_input ;
 
     if( !p_input || p_input->b_dead || !p_input->input.p_item->psz_name )
     {

diff --git a/share/Makefile.am b/share/Makefile.am
index 6bd2aac02956b18b3c6e0031c4989ae679d6506a..3a031db68fc0856481be0de32a2c97e81541eb75 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -15,7 +15,6 @@ dist_pkgdata_DATA = \
 nobase_dist_pkgdata_DATA = \
        $(DIST_skins2) \
        $(DIST_http) \
-       $(DIST_http_old) \
        $(DIST_osdmenu_default) \
        $(DIST_osdmenu_dvd) \
        $(NULL)
@@ -120,24 +119,22 @@ DIST_http = \
        http/images/help.png \
        http/images/playlist_small.png \
        http/mosaic.html \
-       $(NULL)
-
-DIST_http_old = \
-       http-old/index.html \
-       http-old/info.html \
-       http-old/.hosts \
-       http-old/admin/index.html \
-       http-old/admin/browse.html \
-       http-old/admin/dboxfiles.html \
-       http-old/admin/.access \
-       http-old/vlm/edit.html \
-       http-old/vlm/index.html \
-       http-old/vlm/new.html \
-       http-old/style.css \
-       http-old/webcam.html \
-       http-old/favicon.ico \
-       http-old/cone_minus.png \
-       http-old/cone_plus.png \
+       http/old/index.html \
+       http/old/.hosts \
+       http/old/info.html \
+       http/old/webcam.html \
+       http/old/style.css \
+       http/old/cone_plus.png \
+       http/old/cone_minus.png \
+       http/old/favicon.ico \
+       http/old/admin/browse.html \
+       http/old/admin/dboxfiles.html \
+       http/old/admin/index.html \
+       http/old/admin/.access \
+       http/old/vlm/edit.html \
+       http/old/vlm/index.html \
+       http/old/vlm/new.html \
+       http/old/vlm/show.html \
        $(NULL)
 
 DIST_osdmenu_default = \