Changeset 2e50966347e519ed46e448ffb66afe10d3a01cb0

Timestamp:

07/04/06 23:52:33 (3 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1144446753 +0000

git-parent:

[35e982dd4bbae7e3b882e87ee0c61188eb7c5f04]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1144446753 +0000

Message:

Win32 specific changes: Add --started-from-file option to tell VLC that it was started by clicking on a file (or disc). Add --one-instance-when-started-from-file option to tell VLC to use one instance mode when --started-from-file is used. See replies to r15125 for an explanation.

Files:

• src/libvlc.h (modified) (2 diffs)
• src/misc/win32_specific.c (modified) (1 diff)
• vlc.win32.nsi (modified) (5 diffs)

src/libvlc.h

@@ -831 +831 @@
-    "double-click on a file in the explorer. This option will allow you " \
-    "to play the file with the already running instance or enqueue it.")
+
+#define STARTEDFROMFILE_TEXT N_("VLC is started from file association")
+#define STARTEDFROMFILE_LONGTEXT N_( \
+    "Tell VLC that it is being launched due to a file association in the OS" )
+
+#define ONEINSTANCEWHENSTARTEDFROMFILE_TEXT N_( \
+    "Allow only on running instance when started from file")
+#define ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT N_( \
+    "Allow only on running instance when started from file")
-
-#define HPRIORITY_TEXT N_("Increase the priority of the process")
@@ -1465 +1474 @@
-    add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT,
-              ONEINSTANCE_LONGTEXT, VLC_TRUE );
+    add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
+              STARTEDFROMFILE_LONGTEXT, VLC_TRUE );
+    add_bool( "one-instance-when-started-from-file", 1, NULL,
+              ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
+              ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
-    add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
-              PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );

src/misc/win32_specific.c

@@ -150 +150 @@
-    }
-
-
+
+
+
-    {
-        HANDLE hmutex;

vlc.win32.nsi

@@ -174 +174 @@
-  WriteRegStr HKCR "VLC$R0" "" "VLC media file"
-  WriteRegStr HKCR "VLC$R0\shell" "" "Play"
-
+--one-instance-when-started-from-file 
-  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
-FunctionEnd
@@ -220 +220 @@
-!macro AddContextMenu EXT
-  WriteRegStr HKCR ${EXT}\shell\PlayWithVLC "" "Play with VLC media player"
-
+one-instance-when-started-from-file --
-
-  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"
-
+-when-started-from-file
-!macroend
-
@@ -279 +279 @@
-  WriteRegStr HKCR Applications\vlc.exe\shell\Play "" "Play with VLC"
-  WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \
-
+--one-instance-when-started-from-file 
-  !insertmacro MacroAllExtensions WriteRegStrSupportedTypes
-
-  WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"
-  WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
-
+--one-instance-when-started-from-file 
-  WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"
-  WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
-
+--one-instance-when-started-from-file 
-
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""
@@ -298 +298 @@
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival" ""
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Action" "Play CD audio"
-
+ --one-instance-when-started-from-file
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeProgID" "VLC.CDAudio"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeVerb" "play"
@@ -305 +305 @@
-  WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"
-  WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \
-
+--one-instance-when-started-from-file 
-  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" "" \
-
+--one-instance-when-started-from-file 
-  WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
-