Add m2ts and mts to the interface dialog selectors.

[vlc] / extras / package / win32 / vlc.win32.nsi.in

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 92f2a52b9a8ecaca64d152cf0aa059ba17f99e00..6a80cae0a8fcd6c85295b6d14c13c5680219e636 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -5,7 +5,7 @@
 
 !define PRODUCT_NAME "VLC media player"
 !define VERSION @VERSION@
-!define PRODUCT_VERSION @VERSION@ 
+!define PRODUCT_VERSION @VERSION@
 !define PRODUCT_GROUP "VideoLAN"
 !define PRODUCT_PUBLISHER "VideoLAN Team"
 !define PRODUCT_WEB_SITE "http://www.videolan.org"
@@ -199,14 +199,20 @@ FunctionEnd
   !insertmacro ${_action} ".ac3"
   !insertmacro ${_action} ".dts"
   !insertmacro ${_action} ".flac"
+  !insertmacro ${_action} ".m4a"
+  !insertmacro ${_action} ".m4p"
   !insertmacro ${_action} ".mka"
+  !insertmacro ${_action} ".mod"
   !insertmacro ${_action} ".mp1"
   !insertmacro ${_action} ".mp2"
   !insertmacro ${_action} ".mp3"
+  !insertmacro ${_action} ".oma"
   !insertmacro ${_action} ".ogg"
   !insertmacro ${_action} ".spx"
   !insertmacro ${_action} ".wav"
   !insertmacro ${_action} ".wma"
+  !insertmacro ${_action} ".wma"
+  !insertmacro ${_action} ".xm"
 !macroend
 
 !macro MacroVideoExtensions _action
@@ -214,8 +220,12 @@ FunctionEnd
   !insertmacro ${_action} ".avi"
   !insertmacro ${_action} ".divx"
   !insertmacro ${_action} ".dv"
+  !insertmacro ${_action} ".flv"
+  !insertmacro ${_action} ".gxf"
   !insertmacro ${_action} ".m1v"
   !insertmacro ${_action} ".m2v"
+  !insertmacro ${_action} ".m2ts"
+  !insertmacro ${_action} ".m4v"
   !insertmacro ${_action} ".mkv"
   !insertmacro ${_action} ".mov"
   !insertmacro ${_action} ".mp4"
@@ -224,10 +234,11 @@ FunctionEnd
   !insertmacro ${_action} ".mpeg2"
   !insertmacro ${_action} ".mpeg4"
   !insertmacro ${_action} ".mpg"
+  !insertmacro ${_action} ".mts"
   !insertmacro ${_action} ".mxf"
+  !insertmacro ${_action} ".ogm"
   !insertmacro ${_action} ".ps"
   !insertmacro ${_action} ".ts"
-  !insertmacro ${_action} ".ogm"
   !insertmacro ${_action} ".vob"
   !insertmacro ${_action} ".wmv"
 !macroend
@@ -400,9 +411,7 @@ Section "Media player (required)" SEC01
   !insertmacro InstallFolder osdmenu
   !insertmacro InstallFolder skins
   !insertmacro InstallFolder http
-  ;!insertmacro InstallFolder share
   !insertmacro InstallFolder lua
-  ;!insertmacro InstallFolder scripts
 
   ; URLs
   WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \
@@ -424,7 +433,7 @@ Section "Media player (required)" SEC01
   WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \
     '$INSTDIR\vlc.exe --started-from-file "%1"'
   !insertmacro MacroAllExtensions WriteRegStrSupportedTypes
-  
+
 ; Vista Registration
   ; Vista detection
   ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
@@ -500,7 +509,7 @@ Section /o "Mozilla plugin" SEC03
   WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
   WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
 
- ; for very old version of mozilla, these lines may be needed 
+ ; for very old version of mozilla, these lines may be needed
  ;Push $R0
  ;Push $R1
  ;Push $R2
@@ -544,10 +553,10 @@ Section "Discs Playback" SEC05
   SectionIn 1 2 3
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
-    "$INSTDIR\vlc.exe --started-from-file cdda:%1"
+    "$INSTDIR\vlc.exe --started-from-file cdda://%1"
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
-    "$INSTDIR\vlc.exe --started-from-file dvd:%1"
+    "$INSTDIR\vlc.exe --started-from-file 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"
@@ -565,12 +574,12 @@ Section "Discs Playback" SEC05
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"
   WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \
-    '$INSTDIR\vlc.exe --started-from-file dvd:%1'
+    '$INSTDIR\vlc.exe --started-from-file dvd://%1'
   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"
   WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \
-    '$INSTDIR\vlc.exe --started-from-file cdda:%1'
+    '$INSTDIR\vlc.exe --started-from-file cdda://%1'
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
 SectionEnd
@@ -674,7 +683,7 @@ Function un.TrimNewlines
  Push $R1
  Push $R2
  StrCpy $R1 0
- 
+
  loop:
    IntOp $R1 $R1 - 1
    StrCpy $R2 $R0 1 $R1
@@ -683,7 +692,7 @@ Function un.TrimNewlines
    IntOp $R1 $R1 + 1
    IntCmp $R1 0 no_trim_needed
    StrCpy $R0 $R0 $R1
- 
+
  no_trim_needed:
    Pop $R2
    Pop $R1