* ALL: updates for the test release.

diff --git a/Makefile.am b/Makefile.am
index 689ec5aabe299600d6ce7474db8cf4c5f177733e..58f4d01ade74cba5d9ebc1029c2c5175fcd1e74d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -628,12 +628,12 @@ package-win32-base:
             || true ; \
        done
 
-       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts
+       mkdir -p $(srcdir)/vlc-${VERSION}/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins/fonts/ || true ; \
        done
        for i in $(srcdir)/share/skins2/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
        done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"

diff --git a/NEWS b/NEWS
index 81e8f265637e87e61e27ffcf48e41b2e30b18bfc..e6e8c562f3154c14a497bc8558b2c5a0d24ee7c4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,10 +8,9 @@ Core support:
  * Major work on libvlc. Changed/renamed/added functions
  * Complete switch to the new input core (better seeking, multi-input, ...)
  * New plugins cache to speed up launch time
- * Fix crash with deinterlace switching
  * New --play-and-stop feature which stops the playlist after each played item
  * Daemon mode (to run vlc in the background)
- * Technical improvements to the subtitle/OSD subsystem
+ * Major improvements to the subtitle/OSD subsystem
 
 Input:
  * New screen capture input plugin for X11, Win32, BeOS and Mac OS X 
@@ -33,6 +32,7 @@ Demuxers:
  * Support for DTS audio in MPEG TS (ETSI TS 102 154 Annex G)
  * Skins2 .vlt file loader (only when skin2 is the current interface)
  * Improved Ogg demuxer
+ * Support for MPEG PS streams with MPEG 4 video.
  * Support for so called AACPlus webstreams
 
 Codecs:
@@ -58,7 +58,7 @@ Stream Output:
   * Multipart mjpeg muxing. Your video is directly viewable in a Mozilla Browser
   * 14496-17 text track muxing for MPEG TS
   * Support for DTS audio in MPEG TS (ETSI TS 102 154 Annex G)
-  * Experimental WAV muxer
+  * New WAV muxer (supports multi-channel audio)
   * Improved ASF muxer
  Misc:
   * H.263 RTP streaming support
@@ -68,6 +68,7 @@ Stream Output:
 Audio Output:
  * New audio equalizer filter
  * Very trivial volume normalizer
+ * More gradual resampling which should improve the pitch changing effect
 
 Video Output:
  * Roku HD1000 Video output
@@ -115,6 +116,7 @@ Misc:
  * Server/client network synchronization module
  * VBrick streams fully supported
  * Cisco IP/TV streams supported
+ * VLM enhancements
 
 Changes between 0.7.1 and 0.7.2:
 --------------------------------

diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index 0d0c7c72a7569f675e29073832ee90dcc7bd6c54..2d72d6bd653e2f71b2f5690d8c77140205cb358d 100644 (file)
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -181,9 +181,13 @@ bool Win32Factory::init()
 
     // Initialize the resource path
     m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir +
-                               "\\" + CONFIG_DIR + "\\skins2" );
+                               "\\" + CONFIG_DIR + "\\skins" );
+    m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+                              "\\skins" );
     m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
                               "\\skins2" );
+    m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+                              "\\share\\skins" );
     m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
                               "\\share\\skins2" );
 

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 42d2b387f65e0eb0bcffb18a00927c3177851ba4..d16a9b62c259b2e23540e72d6d367668cacde4bd 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -133,7 +133,7 @@ Section "Media player (required)" SEC01
 \r
   File  /r plugins\r
   File  /r locale\r
-  File  /r skins2\r
+  File  /r skins\r
   File  /r http\r
 \r
   WriteRegStr HKCR Applications\vlc.exe "" ""\r
@@ -173,9 +173,11 @@ Section "Start Menu + Desktop Shortcut" SEC02
   SectionIn 1 2 3\r
   CreateDirectory "$SMPROGRAMS\VideoLAN"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wxwin"\r
+    "$INSTDIR\vlc.exe" "--intf wxwin --wxwin-embed"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf wxwin --no-wxwin-embed"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf skins2"\r
+    "$INSTDIR\vlc.exe" "--intf skins"\r
   CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
     "$INSTDIR\vlc.exe" "--intf wxwin"\r
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r