one-instance fix. It now is disabled in vlc prefs but all windows action

(like double clicking on a file or disc) use the --one-instance option.

People used to running 10 instances of VLC at once should now be able
to do so. Normal people used to running other media players should now
get the behavior they expect (ie: not open 10 different VLCs when double
clicking on 10 mp3s)

diff --git a/src/libvlc.h b/src/libvlc.h
index 92cfdeb8ff9a3356d85888802f4d12cda8c27b01..8592b4063b0d3e74e9992b0b44ccd787c1eab0c6 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -1343,7 +1343,7 @@ vlc_module_begin();
 #endif
 
 #if defined(WIN32)
-    add_bool( "one-instance", 1, NULL, ONEINSTANCE_TEXT,
+    add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT,
               ONEINSTANCE_LONGTEXT, VLC_TRUE );
     add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
               PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 5f48862eb95bbc719d42994fc1b26ae348d40f5d..8e6aced57c76256d9379a946a55c8fa108c0a61d 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -173,7 +173,7 @@ NoBackup:
   ReadRegStr $0 HKCR "VLC$R0" ""\r
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
-  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" "%1"'\r
+  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" --one-instance "%1"'\r
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 FunctionEnd\r
 \r
@@ -283,10 +283,10 @@ Section "Media player (required)" SEC01
 \r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \\r
-    "$INSTDIR\vlc.exe cdda:%1"\r
+    "$INSTDIR\vlc.exe --one-instance cdda:%1"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"\r
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \\r
-    "$INSTDIR\vlc.exe dvd:%1"\r
+    "$INSTDIR\vlc.exe --one-instance dvd:%1"\r
 \r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"\r
@@ -304,12 +304,12 @@ Section "Media player (required)" SEC01
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \\r
-    '$INSTDIR\vlc.exe dvd:%1'\r
+    '$INSTDIR\vlc.exe --one-instance dvd:%1'\r
   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"\r
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"\r
   WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \\r
-    '$INSTDIR\vlc.exe cdda:%1'\r
+    '$INSTDIR\vlc.exe --one-instance cdda:%1'\r
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
 SectionEnd\r