[xiph-commits] r17338 - in trunk/oggdsf: . build/NSIS/Release

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2010-07-20 13:35:18 -0700 (Tue, 20 Jul 2010)
New Revision: 17338

Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/build/NSIS/Release/macros.nsi
Log:
Installer uses localised "Open" and "Play" shell commands

Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2010-07-19 16:08:54 UTC (rev 17337)
+++ trunk/oggdsf/ChangeLog.txt	2010-07-20 20:35:18 UTC (rev 17338)
@@ -1,8 +1,10 @@
-Version 0.84.17325 - 05.07.2010
+Version 0.84.17338 - 20.07.2010
 
     * Updated webmdshow to 0.9.9.0
     * Fixed installer script regarding URL registration 
       (fixes "Open URL..." in Windows Media Player)
+    * Fixed Vorbis URL playback which was broken in previous version
+    * Installer uses localised "Open" and "Play" shell commands
 
 Version 0.84.17315 - 30.06.2010
     

Modified: trunk/oggdsf/build/NSIS/Release/macros.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/macros.nsi	2010-07-19 16:08:54 UTC (rev 17337)
+++ trunk/oggdsf/build/NSIS/Release/macros.nsi	2010-07-20 20:35:18 UTC (rev 17338)
@@ -4,6 +4,8 @@
 ; Windows Media Player location
 Var /GLOBAL WMP_LOCATION_WIN32
 Var /GLOBAL WMP_LOCATION_X64
+Var /GLOBAL WMP_OPEN
+Var /GLOBAL WMP_PLAY
 
 ;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ; Location of Visual Studio runtime libraries on the compiling system
@@ -87,10 +89,10 @@
     WriteRegStr HKCR "${typeName}" "" "${description}"
     WriteRegStr HKCR "${typeName}\shell" "" "play"
 
-    WriteRegStr HKCR "${typeName}\shell\open" "" "&Open"
+    WriteRegStr HKCR "${typeName}\shell\open" "" "$WMP_OPEN"
     WriteRegStr HKCR "${typeName}\shell\open\command" "" "$\"${WmpLocation}$\" /Open $\"%L$\""
   
-    WriteRegStr HKCR "${typeName}\shell\play" "" "&Play"
+    WriteRegStr HKCR "${typeName}\shell\play" "" "$WMP_PLAY"
     WriteRegStr HKCR "${typeName}\shell\play\command" "" "$\"${WmpLocation}$\" /Play $\"%L$\""    
 
     ${If} ${AtMostWinVista}
@@ -487,7 +489,15 @@
     ${If} ${RunningX64}
         StrCpy $WMP_LOCATION_X64 "$PROGRAMFILES64\Windows Media Player\wmplayer.exe"
     ${EndIf}
-  
+
+    ReadRegStr $WMP_OPEN HKLM "SOFTWARE\Classes\Applications\wmplayer.exe\shell\open" ""
+    IfErrors 0 +2
+        StrCpy $WMP_OPEN "&Open"
+    
+    ReadRegStr $WMP_PLAY HKLM "SOFTWARE\Classes\Applications\wmplayer.exe\shell\play" ""
+    IfErrors 0 +2
+        StrCpy $WMP_PLAY "&Play"
+
     IfFileExists  $WMP_LOCATION_WIN32 +3 0
     IfSilent +2
     MessageBox MB_OK|MB_ICONEXCLAMATION "A recognised version of Windows Media Player was not found. $\n File extenstion association must be done manually." IDOK 0