Commit 56a2f551 authored by Gildas Bazin's avatar Gildas Bazin

* modules/access/dvdplay/access.c: fixed a bug in dvdNewArea() when i_angle == 0.
* install-win32: misc improvements to the nsis installer script.
parent 2e36f352
......@@ -25,6 +25,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
OutFile ..\vlc-${VERSION}-win32.exe
SetCompressor bzip2
Name "VLC media player"
Caption "VLC '${VERSION}' for Win32 Setup"
......@@ -33,6 +34,7 @@ Caption "VLC '${VERSION}' for Win32 Setup"
CRCCheck on
InstallDir "$PROGRAMFILES\VideoLAN\VLC"
; check if the program has already been installed, if so, take this dir
; as install dir
InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"
......@@ -46,7 +48,7 @@ SetDatablockOptimize on
SetDateSave off
SetCompress auto
UninstallText "This will uninstall the VLC media player. Hit next to continue."
UninstallText "This will uninstall the VLC media player."
;;;;;;;;;;;;;;;;;;;;
; Install settings ;
......@@ -65,8 +67,18 @@ Section "Install"
CreateDirectory "$SMPROGRAMS\VideoLAN"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (wxwindows).lnk" \
"$INSTDIR\vlc.exe" "--intf wxwin"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \
"$INSTDIR\vlc.exe" "--intf skins"
CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\FAQ.htm"
CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"
WriteRegStr HKLM \
SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
"DisplayName" "VideoLAN VLC media player"
WriteRegStr HKLM \
SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
"UninstallString" '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR
......@@ -80,16 +92,9 @@ SectionEnd
;;;;;;;;;;;;;;;;;;;;;;
Section "Uninstall"
Delete $SMPROGRAMS\VideoLAN\*
RMDir $SMPROGRAMS\VideoLAN
Delete $INSTDIR\share\*
RMDir $INSTDIR\share
Delete $INSTDIR\plugins\*
RMDir $INSTDIR\plugins
Delete $INSTDIR\locale\*
RMDir $INSTDIR\locale
Delete $INSTDIR\*
RMDir $INSTDIR
RMDir /r $SMPROGRAMS\VideoLAN
RMDir /r $INSTDIR
DeleteRegKey HKLM SOFTWARE\VideoLAN
DeleteRegKey HKLM \
Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN
SectionEnd
......@@ -2,7 +2,7 @@
* access.c: access capabilities for dvdplay plugin.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: access.c,v 1.15 2003/03/24 17:15:29 gbazin Exp $
* $Id: access.c,v 1.16 2003/04/05 12:32:19 gbazin Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -524,8 +524,12 @@ static int dvdNewArea( input_thread_t * p_input, input_area_t * p_area )
input_AddProgram( p_input, i+1, 0 );
}
if( i_angle )
dvdplay_SetProgram( p_input,
p_input->stream.pp_programs[i_angle-1] );
else
dvdplay_SetProgram( p_input,
p_input->stream.pp_programs[0] );
/* No PSM to read in DVD mode, we already have all information */
p_input->stream.p_selected_program->b_is_ok = 1;
......
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