Switch MMS to poll to avoid select() issues. Needs review/testing.

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index af5bc480a7c6a66e3966fc7387b637c1d82bc78d..6206b4877c6e6cb5b0687b5c60944994abbb24fb 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
@@ -144,6 +145,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
@@ -225,22 +227,30 @@ FunctionEnd
 ; Context menu entries ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
+!macro AddContextMenuExt EXT\r
+  WriteRegStr HKCR ${EXT}\shell\PlayWithVLC "" "Play with VLC media player"\r
+  WriteRegStr HKCR ${EXT}\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'\r
+\r
+  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"\r
+  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'\r
+!macroend\r
+\r
 !macro AddContextMenu EXT\r
   Push $R0\r
   ReadRegStr $R0 HKCR ${EXT} ""\r
-  WriteRegStr HKCR $R0\shell\PlayWithVLC "" "Play with VLC media player"\r
-  WriteRegStr HKCR $R0\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'\r
-\r
-  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"\r
-  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'\r
+  !insertmacro AddContextMenuExt $R0\r
   Pop $R0\r
 !macroend\r
 \r
+!macro DeleteContextMenuExt EXT\r
+  DeleteRegKey HKCR ${EXT}\shell\PlayWithVLC\r
+  DeleteRegKey HKCR ${EXT}\shell\AddToPlaylistVLC\r
+!macroend\r
+\r
 !macro DeleteContextMenu EXT\r
   Push $R0\r
   ReadRegStr $R0 HKCR ${EXT} ""\r
-  DeleteRegKey HKCR $R0\shell\PlayWithVLC\r
-  DeleteRegKey HKCR $R0\shell\AddToPlaylistVLC\r
+  !insertmacro DeleteContextMenuExt $R0\r
   Pop $R0\r
 !macroend\r
 \r
@@ -342,6 +352,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
@@ -349,6 +362,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
@@ -482,6 +496,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
@@ -513,7 +530,7 @@ SectionGroupEnd
 Section /o "Context Menus" SEC05\r
   SectionIn 3\r
   !insertmacro MacroAllExtensions AddContextMenu\r
-  !insertmacro AddContextMenu "Directory"\r
+  !insertmacro AddContextMenuExt "Directory"\r
 SectionEnd\r
 \r
 Section /o "Delete preferences and cache" SEC07\r
@@ -641,7 +658,7 @@ Section "Uninstall" SEC91
 \r
   !insertmacro MacroAllExtensions DeleteContextMenu\r
   !insertmacro MacroAllExtensions UnRegisterExtensionSection\r
-  !insertmacro DeleteContextMenu "Directory"\r
+  !insertmacro DeleteContextMenuExt "Directory"\r
 \r
   ;remove activex plugin\r
   UnRegDLL "$INSTDIR\axvlc.dll"\r