- set rc_min_rate = rc_max_rate when strict-rc is set

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 6f36c3fcdbc030c1b4bbbba0bf7c7a54628faa1c..8a4a5dc84c9566ed47afe44b1d0430690062aa24 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -18,6 +18,7 @@
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"\r
 \r
 @FILE_LIBVLC_DLL@\r
+@FILE_LIBVLC_CONTROL_DLL@\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
@@ -101,6 +102,7 @@ InstType "Full"
   !insertmacro MUI_LANGUAGE "Portuguese"\r
   !insertmacro MUI_LANGUAGE "Arabic"\r
   !insertmacro MUI_LANGUAGE "Polish"\r
+  !insertmacro MUI_LANGUAGE "Romanian"\r
 \r
 !insertmacro MUI_RESERVEFILE_LANGDLL\r
 \r
@@ -144,6 +146,7 @@ InstType "Full"
   !insertmacro ${_action} ".mpeg2"\r
   !insertmacro ${_action} ".mpeg4"\r
   !insertmacro ${_action} ".mpg"\r
+  !insertmacro ${_action} ".mxf"\r
   !insertmacro ${_action} ".ps"\r
   !insertmacro ${_action} ".ts"\r
   !insertmacro ${_action} ".ogm"\r
@@ -183,6 +186,15 @@ NoBackup:
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
   WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" --started-from-file "%1"'\r
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
+\r
+  ; Vista detection\r
+  ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion\r
+  StrCpy $R2 $R1 3\r
+  StrCmp $R2 '6.0' ForVista ToEnd\r
+ForVista:\r
+  WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities\FileAssociations" "$R0" "VLC$R0"\r
+ToEnd:\r
+\r
 FunctionEnd\r
 \r
 Function un.RegisterExtension\r
@@ -350,6 +362,9 @@ Section "Media player (required)" SEC01
   !ifdef LIBVLC_DLL\r
   !insertmacro InstallFile ${LIBVLC_DLL}\r
   !endif\r
+  !ifdef LIBVLC_CONTROL_DLL\r
+  !insertmacro InstallFile ${LIBVLC_CONTROL_DLL}\r
+  !endif\r
   !insertmacro InstallFile *.txt\r
 \r
   !insertmacro InstallFolder plugins\r
@@ -357,6 +372,7 @@ Section "Media player (required)" SEC01
   !insertmacro InstallFolder osdmenu\r
   !insertmacro InstallFolder skins\r
   !insertmacro InstallFolder http\r
+  !insertmacro InstallFolder share\r
 \r
   WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
@@ -406,6 +422,18 @@ Section "Media player (required)" SEC01
     '$INSTDIR\vlc.exe --started-from-file cdda:%1'\r
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
+  ; Vista detection\r
+  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion\r
+  StrCpy $R1 $R0 3\r
+  StrCmp $R1 '6.0' lbl_vista lbl_done\r
+\r
+  lbl_vista:\r
+  WriteRegStr HKLM "Software\RegisteredApplications" "VLC" "Software\Clients\Media\VLC\Capabilities"\r
+  WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationName" "VLC media player"\r
+  WriteRegStr HKLM "Software\Clients\Media\VLC\Capabilities" "ApplicationDescription" "VLC - The video swiss knife"\r
+\r
+  lbl_done:\r
+\r
 SectionEnd\r
 \r
 Section "Start Menu Shortcut" SEC02a\r
@@ -490,6 +518,9 @@ Section /o "Mozilla plugin" SEC03
  ;  !ifdef LIBVLC_DLL\r
  ;  CopyFiles ${LIBVLC_DLL} "$R2"\r
  ;  !endif\r
+ ;  !ifdef LIBVLC_CONTROL_DLL\r
+ ;  CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"\r
+ ;  !endif\r
  ;  Goto "${Index}-Loop"\r
 \r
  ;"${Index}-End:"\r
@@ -712,6 +743,7 @@ Section "Uninstall" SEC91
   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 HKLM Software\Clients\Media\VLC\r
   DeleteRegKey HKCR "VLC.MediaFile"\r
 \r
   DeleteRegKey HKLM \\r