* ALL: updates for the test release.

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"

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:
 --------------------------------

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" );
 

vlc.win32.nsi

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