+ mux/asf.c: gcc < 3 compile fix

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index aba1f0afffd4304c7b1598a0f89823f43f075214..42d2b387f65e0eb0bcffb18a00927c3177851ba4 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -133,7 +133,6 @@ Section "Media player (required)" SEC01
 \r
   File  /r plugins\r
   File  /r locale\r
-  File  /r skins\r
   File  /r skins2\r
   File  /r http\r
 \r
@@ -144,10 +143,29 @@ Section "Media player (required)" SEC01
 \r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \\r
-    '$INSTDIR\vlc.exe cdda:%1'\r
+    "$INSTDIR\vlc.exe cdda:%1"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \\r
-    '$INSTDIR\vlc.exe dvd:%1'\r
+    "$INSTDIR\vlc.exe dvd:%1"\r
+\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Invoke.ProgID" "VLC.MediaFile"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeVerb" "play"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Provider" "VideoLAN VLC media player"\r
+\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival" ""\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Action" "Play CD audio"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Invoke.ProgID" "VLC.MediaFile"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeVerb" "play"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Provider" "VideoLAN VLC media player"\r
+  WriteRegStr HKCR "VLC.MediaFile" "" "VLC media file"\r
+  WriteRegStr HKCR "VLC.MediaFile\shell" "" "Play"\r
+  WriteRegStr HKCR "VLC.MediaFile\shell\Play\command" "" \\r
+    '$INSTDIR\vlc.exe "%1"'\r
+  WriteRegStr HKCR "VLC.MediaFile\DefaultIcon" "" "$INSTDIR\vlc.exe,0"\r
 \r
 SectionEnd\r
 \r
@@ -157,8 +175,9 @@ Section "Start Menu + Desktop Shortcut" SEC02
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
     "$INSTDIR\vlc.exe" "--intf wxwin"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf skins"\r
-  CreateShortCut "$DESKTOP\VLC media player.lnk" "$INSTDIR\vlc.exe"\r
+    "$INSTDIR\vlc.exe" "--intf skins2"\r
+  CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf wxwin"\r
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \\r
@@ -184,7 +203,6 @@ SubSection "File type associations" SEC04
   !insertmacro RegisterExtensionSection ".avi"\r
   !insertmacro RegisterExtensionSection ".bin"\r
   !insertmacro RegisterExtensionSection ".cue"\r
-  !insertmacro RegisterExtensionSection ".dat"\r
   !insertmacro RegisterExtensionSection ".divx"\r
   !insertmacro RegisterExtensionSection ".dts"\r
   !insertmacro RegisterExtensionSection ".dv"\r
@@ -271,7 +289,6 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".avi"\r
   !insertmacro UnRegisterExtensionSection ".bin"\r
   !insertmacro UnRegisterExtensionSection ".cue"\r
-  !insertmacro UnRegisterExtensionSection ".dat"\r
   !insertmacro UnRegisterExtensionSection ".divx"\r
   !insertmacro UnRegisterExtensionSection ".dts"\r
   !insertmacro UnRegisterExtensionSection ".dv"\r
@@ -308,6 +325,11 @@ Section Uninstall
   DeleteRegKey HKCR Applications\vlc.exe\r
   DeleteRegKey HKCR AudioCD\shell\PlayWithVLC\r
   DeleteRegKey HKCR DVD\shell\PlayWithVLC\r
+  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival"\r
+  DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival\r
+  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival"\r
+  DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival\r
+  DeleteRegKey HKCR "VLC.MediaFile"\r
 \r
   DeleteRegKey HKLM \\r
     SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}\r