FunctionEnd\r
\r
!macro RegisterExtensionSection EXT\r
- Section /o ${EXT}\r
+ Section ${EXT}\r
SectionIn 1 3\r
Push $R0\r
StrCpy $R0 ${EXT}\r
;;;;;;;;;;;;;;;;;;;;;;;;;;\r
\r
!macro delprefs\r
- SectionIn 1 3\r
StrCpy $0 0\r
!define Index 'Line${__LINE__}'\r
"${Index}-Loop:"\r
!insertmacro InstallFolder skins\r
!insertmacro InstallFolder http\r
\r
- WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
+ WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \\r
"${PRODUCT_WEB_SITE}"\r
- FileWrite $UninstallLog "${PRODUCT_NAME}.url$\r$\n"\r
+ FileWrite $UninstallLog "${PRODUCT_GROUP} Website.url$\r$\n"\r
WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" \\r
"${PRODUCT_WEB_SITE}/doc/"\r
FileWrite $UninstallLog "Documentation.url$\r$\n"\r
Section "Start Menu Shortcut" SEC02a\r
SectionIn 1 2 3\r
CreateDirectory "$SMPROGRAMS\VideoLAN"\r
- CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
- "$INSTDIR\vlc.exe" "" \r
- CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \\r
- "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "\r
- CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r
- "$INSTDIR\${PRODUCT_NAME}.url"\r
+ CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings"\r
+ CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Audio"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to DirectX (default).lnk" \\r
+ "$INSTDIR\vlc.exe" "--aout aout_directx --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \\r
+ "$INSTDIR\vlc.exe" "--aout waveout --save-config vlc:quit"\r
+ CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \\r
+ "$INSTDIR\vlc.exe" "-I skins --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to wxWidgets (default).lnk" \\r
+ "$INSTDIR\vlc.exe" "-I wxwin --save-config vlc:quit"\r
+ CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"\r
+ ; FIXME add detection for Vista. Direct3D will be default there, for all others it's DirectX\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to Direct3D.lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout direct3d --overlay --directx-hw-yuv --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to Direct3D (no hardware acceleration).lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout direct3d --overlay --no-directx-hw-yuv --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX.lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout directx --overlay --directx-hw-yuv --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX (no hardware acceleration).lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout directx --no-overlay --no-directx-hw-yuv --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to DirectX (no video overlay).lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout directx --no-overlay --directx-hw-yuv --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Video\Set Video mode to OpenGL.lnk" \\r
+ "$INSTDIR\vlc.exe" "--vout opengl --overlay --save-config vlc:quit"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Reset VLC media player preferences and cache files.lnk" \\r
+ "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit"\r
CreateShortCut "$SMPROGRAMS\VideoLAN\Documentation.lnk" \\r
"$INSTDIR\Documentation.url"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Release Notes.lnk" \\r
+ "$INSTDIR\NEWS.txt" ""\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_GROUP} Website.lnk" \\r
+ "$INSTDIR\${PRODUCT_GROUP} Website.url"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
+ "$INSTDIR\vlc.exe" ""\r
SectionEnd\r
\r
Section "Desktop Shortcut" SEC02b\r
SectionEnd\r
\r
Section /o "Mozilla plugin" SEC03\r
- SectionIn 1 3\r
+ SectionIn 3\r
\r
+ SetOutPath "$INSTDIR"\r
!insertmacro OpenUninstallLog\r
- !insertmacro InstallFolder mozilla\r
+ !insertmacro InstallFile mozilla\npvlc.dll\r
!insertmacro CloseUninstallLog\r
\r
- ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)\r
- ; see mozilla bugs 184506 and 159445\r
- ;!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"\r
- ;WriteRegStr HKLM ${Moz} "Description" "VideoLAN VLC plugin for Mozilla"\r
- ;WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\mozilla\npvlc.dll"\r
- ;WriteRegStr HKLM ${Moz} "Product" "VLC media player"\r
- ;WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"\r
- ;WriteRegStr HKLM ${Moz} "Version" "${VERSION}"\r
- ;WriteRegStr HKLM ${Moz} "XPTPath" "$INSTDIR\mozilla\vlcintf.xpt"\r
+ !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"\r
+ WriteRegStr HKLM ${Moz} "Description" "VLC Multimedia Plugin"\r
+ WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\npvlc.dll"\r
+ WriteRegStr HKLM ${Moz} "Product" "VLC media player"\r
+ WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"\r
+ WriteRegStr HKLM ${Moz} "Version" "${VERSION}"\r
\r
- Push $R0\r
- Push $R1\r
- Push $R2\r
+ ; for very old version of mozilla, these lines may be needed \r
+ ;Push $R0\r
+ ;Push $R1\r
+ ;Push $R2\r
\r
- !define Index 'Line${__LINE__}'\r
- StrCpy $R1 "0"\r
+ ;!define Index 'Line${__LINE__}'\r
+ ;StrCpy $R1 "0"\r
\r
- "${Index}-Loop:"\r
+ ;"${Index}-Loop:"\r
\r
- ; Check for Key\r
- EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"\r
- StrCmp $R0 "" "${Index}-End"\r
- IntOp $R1 $R1 + 1\r
- ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
- StrCmp $R2 "" "${Index}-Loop" ""\r
+ ; ; Check for Key\r
+ ; EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"\r
+ ; StrCmp $R0 "" "${Index}-End"\r
+ ; IntOp $R1 $R1 + 1\r
+ ; ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
+ ; StrCmp $R2 "" "${Index}-Loop" ""\r
\r
- CopyFiles "$INSTDIR\mozilla\*" "$R2"\r
- !ifdef LIBVLC_DLL\r
- CopyFiles ${LIBVLC_DLL} "$R2"\r
- !endif\r
- Goto "${Index}-Loop"\r
+ ; CopyFiles "$INSTDIR\npvlc.dll" "$R2"\r
+ ; !ifdef LIBVLC_DLL\r
+ ; CopyFiles ${LIBVLC_DLL} "$R2"\r
+ ; !endif\r
+ ; Goto "${Index}-Loop"\r
\r
- "${Index}-End:"\r
- !undef Index\r
+ ;"${Index}-End:"\r
+ ;!undef Index\r
\r
SectionEnd\r
\r
-Section /o "ActiveX plugin" SEC04\r
+Section "ActiveX plugin" SEC04\r
SectionIn 1 3\r
SetOutPath "$INSTDIR"\r
!insertmacro OpenUninstallLog\r
!insertmacro MacroAllExtensions UnRegisterExtensionSection\r
!insertmacro DeleteContextMenu "Directory"\r
\r
+ ;remove activex plugin\r
UnRegDLL "$INSTDIR\axvlc.dll"\r
Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r
\r
ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
StrCmp $R2 "" "${Index}-Loop" ""\r
\r
- Delete "$R2\npvlc.dll"\r
+ ; old files (0.8.5 and before) that may be lying around\r
+ Delete /REBOOTOK "$R2\npvlc.dll"\r
+ Delete /REBOOTOK "$R2\libvlc.dll"\r
+ Delete /REBOOTOK "$R2\vlcintf.xpt"\r
Goto "${Index}-Loop"\r
\r
"${Index}-End:"\r
!undef Index\r
+ Delete /REBOOTOK "$INSTDIR\npvlc.dll"\r
\r
RMDir "$SMPROGRAMS\VideoLAN"\r
RMDir /r $SMPROGRAMS\VideoLAN\r
SectionEnd\r
\r
Section /o "un.Delete preferences and cache" SEC92\r
- SectionIn 1 3\r
!insertmacro delprefs\r
SectionEnd\r
\r