[vlc-commits] commit: Win32: fix file opening from context menu (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Tue Jun 15 00:05:17 CEST 2010
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jun 15 00:02:18 2010 +0200| [4a31d472d7959c452788f9a3c9f67602d0794038] | committer: Jean-Baptiste Kempf
Win32: fix file opening from context menu
Also when double-clicking.
This fixes #3604
(cherry picked from commit fe0bf180e4ea6412d5cd07b613605daf8eca1971)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4a31d472d7959c452788f9a3c9f67602d0794038
---
src/win32/specific.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/win32/specific.c b/src/win32/specific.c
index e362e27..24f1a74 100644
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -1,7 +1,7 @@
/*****************************************************************************
* specific.c: Win32 specific initilization
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2004, 2010 the VideoLAN team
*
* Authors: Samuel Hocevar <sam at zoy.org>
* Gildas Bazin <gbazin at videolan.org>
@@ -29,6 +29,7 @@
#include <vlc_common.h>
#include "../libvlc.h"
#include <vlc_playlist.h>
+#include <vlc_url.h>
#include "../config/vlc_getopt.h"
@@ -344,18 +345,18 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
/* Count the input options */
while( i_opt + i_options + 1 < i_argc &&
- *ppsz_argv[ i_opt + i_options + 1 ] == ':' )
+ *ppsz_argv[ i_opt + i_options + 1 ] == ':' )
{
i_options++;
}
- playlist_AddExt( p_playlist, ppsz_argv[i_opt],
- NULL, PLAYLIST_APPEND |
+ playlist_AddExt( p_playlist, make_URI( ppsz_argv[i_opt] ),
+ NULL, PLAYLIST_APPEND |
( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ),
- PLAYLIST_END, -1,
- i_options,
- (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
- VLC_INPUT_OPTION_TRUSTED,
- true, pl_Unlocked );
+ PLAYLIST_END, -1,
+ i_options,
+ (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
+ VLC_INPUT_OPTION_TRUSTED,
+ true, pl_Unlocked );
i_opt += i_options;
}
More information about the vlc-commits
mailing list