X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi;h=fa41aaa720bc359e05d61b7979ed1bad057cfe73;hb=beb1ae86c994026e553f4e5ae2f1773a0c8dbb36;hp=eaa46b2c636b6863ff1894a08c3bc571b34c3f30;hpb=338a7e695fe0a2123fff5efeb410f368ea8d2072;p=vlc

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index eaa46b2c63..fa41aaa720 100644
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -84,7 +84,7 @@ NoBackup:
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"
   WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '$INSTDIR\vlc.exe "%1"'
-  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" "$INSTDIR\vlc.exe,0"
+  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 FunctionEnd
 
 Function un.RegisterExtension
@@ -134,7 +134,6 @@ Section "Media player (required)" SEC01
   File  /r plugins
   File  /r locale
   File  /r skins
-  File  /r skins2
   File  /r http
 
   WriteRegStr HKCR Applications\vlc.exe "" ""
@@ -142,16 +141,45 @@ Section "Media player (required)" SEC01
   WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \
     '$INSTDIR\vlc.exe "%1"'
 
+  WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"
+  WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
+    "$INSTDIR\vlc.exe cdda:%1"
+  WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"
+  WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
+    "$INSTDIR\vlc.exe dvd:%1"
+
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Invoke.ProgID" "VLC.MediaFile"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeVerb" "play"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Provider" "VideoLAN VLC media player"
+
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival" ""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Action" "Play CD audio"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Invoke.ProgID" "VLC.MediaFile"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeVerb" "play"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Provider" "VideoLAN VLC media player"
+  WriteRegStr HKCR "VLC.MediaFile" "" "VLC media file"
+  WriteRegStr HKCR "VLC.MediaFile\shell" "" "Play"
+  WriteRegStr HKCR "VLC.MediaFile\shell\Play\command" "" \
+    '$INSTDIR\vlc.exe "%1"'
+  WriteRegStr HKCR "VLC.MediaFile\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
+
 SectionEnd
 
 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 skins"
-  CreateShortCut "$DESKTOP\VLC media player.lnk" "$INSTDIR\vlc.exe"
+  CreateShortCut "$DESKTOP\VLC media player.lnk" \
+    "$INSTDIR\vlc.exe" "--intf wxwin"
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \
     "${PRODUCT_WEB_SITE}"
   CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \
@@ -177,7 +205,6 @@ SubSection "File type associations" SEC04
   !insertmacro RegisterExtensionSection ".avi"
   !insertmacro RegisterExtensionSection ".bin"
   !insertmacro RegisterExtensionSection ".cue"
-  !insertmacro RegisterExtensionSection ".dat"
   !insertmacro RegisterExtensionSection ".divx"
   !insertmacro RegisterExtensionSection ".dts"
   !insertmacro RegisterExtensionSection ".dv"
@@ -202,6 +229,7 @@ SubSection "File type associations" SEC04
   !insertmacro RegisterExtensionSection ".pls"
   !insertmacro RegisterExtensionSection ".spx"
   !insertmacro RegisterExtensionSection ".vob"
+  !insertmacro RegisterExtensionSection ".vlc"
   !insertmacro RegisterExtensionSection ".wav"
   !insertmacro RegisterExtensionSection ".wma"
   !insertmacro RegisterExtensionSection ".wmv"
@@ -264,7 +292,6 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".avi"
   !insertmacro UnRegisterExtensionSection ".bin"
   !insertmacro UnRegisterExtensionSection ".cue"
-  !insertmacro UnRegisterExtensionSection ".dat"
   !insertmacro UnRegisterExtensionSection ".divx"
   !insertmacro UnRegisterExtensionSection ".dts"
   !insertmacro UnRegisterExtensionSection ".dv"
@@ -289,6 +316,7 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".pls"
   !insertmacro UnRegisterExtensionSection ".spx"
   !insertmacro UnRegisterExtensionSection ".vob"
+  !insertmacro UnRegisterExtensionSection ".vlc"
   !insertmacro UnRegisterExtensionSection ".wav"
   !insertmacro UnRegisterExtensionSection ".wma"
   !insertmacro UnRegisterExtensionSection ".wmv"
@@ -299,6 +327,13 @@ Section Uninstall
   DeleteRegKey HKLM Software\VideoLAN
 
   DeleteRegKey HKCR Applications\vlc.exe
+  DeleteRegKey HKCR AudioCD\shell\PlayWithVLC
+  DeleteRegKey HKCR DVD\shell\PlayWithVLC
+  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival"
+  DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival
+  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival"
+  DeleteRegKey HKLM Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival
+  DeleteRegKey HKCR "VLC.MediaFile"
 
   DeleteRegKey HKLM \
     SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}