Commit bff9e8e3 authored by Gildas Bazin's avatar Gildas Bazin

* modules/demux/dvdnav.c, modules/access/dvdplay/tools.c: on win32, remove...

* modules/demux/dvdnav.c, modules/access/dvdplay/tools.c: on win32, remove trailing '\' if passed a drive letter.
* vlc.win32.nsi: DVD and AudioCD handlers.
parent 8761ea0d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* tools.c: tools for dvd plugin. * tools.c: tools for dvd plugin.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: tools.c,v 1.4 2003/01/28 15:05:52 massiot Exp $ * $Id$
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -107,6 +107,12 @@ char * dvdplay_ParseCL( input_thread_t * p_input, ...@@ -107,6 +107,12 @@ char * dvdplay_ParseCL( input_thread_t * p_input,
{ {
/* Don't try to stat the file */ /* Don't try to stat the file */
} }
else if( psz_source[0] && psz_source[1] == ':' &&
psz_source[2] == '\\' && psz_source[3] == '\0' )
{
/* Don't try to stat the file */
psz_source[2] = '\0';
}
else else
#endif #endif
{ {
......
...@@ -291,6 +291,14 @@ static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force, ...@@ -291,6 +291,14 @@ static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force,
if( !psz_source ) return NULL; if( !psz_source ) return NULL;
} }
#ifdef WIN32
if( psz_source[0] && psz_source[1] == ':' &&
psz_source[2] == '\\' && psz_source[3] == '\0' )
{
psz_source[2] = '\0';
}
#endif
msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d", msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
psz_source, *i_title, *i_chapter, *i_angle ); psz_source, *i_title, *i_chapter, *i_angle );
......
...@@ -142,6 +142,13 @@ Section "Media player (required)" SEC01 ...@@ -142,6 +142,13 @@ Section "Media player (required)" SEC01
WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \ WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \
'$INSTDIR\vlc.exe "%1"' '$INSTDIR\vlc.exe "%1"'
WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player"
WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
'$INSTDIR\vlc.exe cdda:%1'
WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" "Play with VLC media player"
WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
'$INSTDIR\vlc.exe dvd:%1'
SectionEnd SectionEnd
Section "Start Menu + Desktop Shortcut" SEC02 Section "Start Menu + Desktop Shortcut" SEC02
...@@ -299,6 +306,8 @@ Section Uninstall ...@@ -299,6 +306,8 @@ Section Uninstall
DeleteRegKey HKLM Software\VideoLAN DeleteRegKey HKLM Software\VideoLAN
DeleteRegKey HKCR Applications\vlc.exe DeleteRegKey HKCR Applications\vlc.exe
DeleteRegKey HKCR AudioCD\shell\PlayWithVLC
DeleteRegKey HKCR DVD\shell\PlayWithVLC
DeleteRegKey HKLM \ DeleteRegKey HKLM \
SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment