vout_intf.c: write snapshots on Desktop on BeOS

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 9771248dd5d17a71c4b6ce608dc8c7641de8b7df..ab6327f7f9d5660c829c891370a07f004ce04eae 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -84,7 +84,7 @@ NoBackup:
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
   WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '$INSTDIR\vlc.exe "%1"'\r
-  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" "$INSTDIR\vlc.exe,0"\r
+  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 FunctionEnd\r
 \r
 Function un.RegisterExtension\r
@@ -150,22 +150,27 @@ Section "Media player (required)" SEC01
 \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" "DefaultIcon" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeProgID" "VLC.DVDMovie"\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" "DefaultIcon" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeProgID" "VLC.CDAudio"\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
+  WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"\r
+  WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"\r
+  WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \\r
+    '$INSTDIR\vlc.exe dvd:%1@1:0'\r
+  WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"\r
+  WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"\r
+  WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \\r
+    '$INSTDIR\vlc.exe cdda:%1'\r
+  WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
 SectionEnd\r
 \r
@@ -188,14 +193,21 @@ SectionEnd
 \r
 Section /o "Mozilla plugin" SEC03\r
   SectionIn 2 3\r
-  File  /r mozilla\r
+  File /r mozilla\r
 \r
   WriteRegStr HKLM \\r
     SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \\r
     "Path" '"$INSTDIR\mozilla\npvlc.dll"'\r
 SectionEnd\r
 \r
-SubSection "File type associations" SEC04\r
+Section /o "ActiveX plugin" SEC04\r
+  SectionIn 2 3\r
+  SetOutPath "$INSTDIR"\r
+  File activex\axvlc.dll\r
+  RegDLL "$INSTDIR\axvlc.dll"\r
+SectionEnd\r
+\r
+SubSection "File type associations" SEC05\r
   ; Make sure we have the same list in uninstall\r
   !insertmacro RegisterExtensionSection ".a52"\r
   !insertmacro RegisterExtensionSection ".aac"\r
@@ -264,6 +276,8 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \\r
     "The VLC mozilla plugin"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
+    "The VLC ActiveX plugin"\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \\r
     "Sets VLC media player as the default application for the specified file type"\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
@@ -321,6 +335,9 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".wma"\r
   !insertmacro UnRegisterExtensionSection ".wmv"\r
 \r
+  UnRegDLL "$INSTDIR\axvlc.dll"\r
+  Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r
+\r
   RMDir "$SMPROGRAMS\VideoLAN"\r
   RMDir /r $SMPROGRAMS\VideoLAN\r
   RMDir /r $INSTDIR\r