Skip to content

V
vlc-gpu
Commit d1296b32 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./bootstrap: bootstrap now requires the --config flag. With no arguments 

    it simply outputs a usage message.
  * ./src/*: fixed a bunch of (legitimate) warnings under VC++.
  * ./evc/*, ./msvc/*: split the workspaces into three projects (libvlc, vlc
    and plugins -- plugins doesn't build anything yet).
parent 5b2cc57a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4396 additions and 2491 deletions
Makefile.am
View file @ d1296b32
...@@ -272,23 +272,28 @@ EXTRA_DIST += \ ...@@ -272,23 +272,28 @@ EXTRA_DIST += \
############################################################################### ###############################################################################
EXTRA_DIST += \ EXTRA_DIST += \
msvc/vlc.dsp \
msvc/vlc.dsw \ msvc/vlc.dsw \
msvc/libvlc.dsp \
msvc/libvlc.dsp.in \
msvc/vlc.dsp \
msvc/vlc.dsp.in \ msvc/vlc.dsp.in \
msvc/vlc.dsp.out \ msvc/vlc.dsp.out \
msvc/plugins.dsp \
msvc/plugins.dsp.in \
msvc/config.h \ msvc/config.h \
msvc/modules_builtin_msvc.h \ msvc/modules_builtin_msvc.h \
evc/vlc.vcp \
evc/vlc.vcw \ evc/vlc.vcw \
evc/libvlc.vcp \
evc/libvlc.vcp.in \
evc/vlc.vcp \
evc/vlc.vcp.in \ evc/vlc.vcp.in \
evc/vlc.vcp.out \ evc/vlc.vcp.out \
evc/plugins.vcp \
evc/plugins.vcp.in \
evc/config.h \ evc/config.h \
evc/modules_builtin_msvc.h \ evc/modules_builtin_evc.h \
$(NULL) $(NULL)
show-vlc-sources: FORCE
@echo X: $(vlc_SOURCES)
show-libvlc-sources: FORCE show-libvlc-sources: FORCE
@echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc) @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
......
bootstrap
View file @ d1296b32
#! /bin/sh #! /bin/sh
## bootstrap file for vlc, the VideoLAN Client ## bootstrap file for vlc, the VideoLAN Client
## $Id: bootstrap,v 1.26 2002/11/13 15:28:23 sam Exp $ ## $Id: bootstrap,v 1.27 2002/11/13 20:51:03 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -11,35 +11,61 @@ ...@@ -11,35 +11,61 @@
LANG=C LANG=C
export LANG export LANG
##
## Give help
##
help()
{
if test "$do_help" = "yes"
then
cat << EOF
recognized flags are:
--config create Makefile and configure scripts (read HACKING)
--update-vc update Microsoft Visual Studio files
--update-po update translation files
EOF
exit 1
fi
}
### ###
### argument check ### argument check
### ###
do_help=yes
do_po=no do_po=no
do_vc=no do_vc=no
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
--config)
do_help=no
;;
--update-vc) --update-vc)
do_help=no
do_vc=yes do_vc=yes
;; ;;
--update-po) --update-po)
do_help=no
do_po=yes do_po=yes
;; ;;
*) *)
echo "$0: unknown option $1" echo "$0: unknown option $1"
echo "recognized flags are --update-vc and --update-po" do_help=yes
exit 1 help
;; ;;
esac esac
shift shift
done done
##
## Give help if needed
##
help
## ##
## Update the MSVC project files ## Update the MSVC project files
## ##
if test "$do_vc" = "no" if test "$do_vc" = "yes"
then then
echo "not updating MSVC or eVC project file. use --update-vc to force doing it."
else
if test ! -f Makefile if test ! -f Makefile
then then
echo "no Makefile found, did you run ./configure?" echo "no Makefile found, did you run ./configure?"
...@@ -54,7 +80,8 @@ else ...@@ -54,7 +80,8 @@ else
LIBVLC_HEADERS=`make show-libvlc-headers | grep '^X: ' | cut -b3-` LIBVLC_HEADERS=`make show-libvlc-headers | grep '^X: ' | cut -b3-`
LIBVLC_PKG_HEADERS=`make show-libvlc-pkg-headers | grep '^X: ' | cut -b3-` LIBVLC_PKG_HEADERS=`make show-libvlc-pkg-headers | grep '^X: ' | cut -b3-`
for target in evc/vlc.vcp msvc/vlc.dsp # libvlc files
for target in evc/libvlc.vcp msvc/libvlc.dsp
do do
rm -f ${target} rm -f ${target}
# Top of the project file # Top of the project file
...@@ -63,23 +90,6 @@ else ...@@ -63,23 +90,6 @@ else
cat >> ${target} << EOF cat >> ${target} << EOF
# Begin Group "Source Files"${M} # Begin Group "Source Files"${M}
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M} # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
# Begin Group "vlc"${M}
# Begin Source File${M}
EOF
if test "${target}" = "evc/vlc.vcp"
then
cat >> ${target} << EOF
SOURCE="..\\evc\\vlc.c"${M}
EOF
else
cat >> ${target} << EOF
SOURCE="..\\src\\vlc.c"${M}
EOF
fi
cat >> ${target} << EOF
# End Source File${M}
# End Group${M}
# Begin Group "libvlc"${M}
EOF EOF
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"`
do do
...@@ -97,42 +107,42 @@ EOF ...@@ -97,42 +107,42 @@ EOF
EOF EOF
for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"`
do do
if test "${target}" = "evc/vlc.vcp" if test "${target}" = "evc/libvlc.vcp"
then then
cat >> ${target} << EOF cat >> ${target} << EOF
# Begin Source File${M} # Begin Source File${M}
SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M}
# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} # ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M}
!IF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Release"${M} !IF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Release"${M}
# PROP Intermediate_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "MIPSRel\\${subdir}"${M}
# PROP Output_Dir "Release\\${subdir}"${M} # PROP Output_Dir "MIPSRel\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"${M}
# PROP Intermediate_Dir "Debug\\${subdir}"${M} # PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M}
# PROP Output_Dir "Debug\\${subdir}"${M} # PROP Output_Dir "MIPSDbg\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Release"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Release"${M}
# PROP Intermediate_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "SH4Rel\\${subdir}"${M}
# PROP Output_Dir "Release\\${subdir}"${M} # PROP Output_Dir "SH4Rel\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Debug"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Debug"${M}
# PROP Intermediate_Dir "Debug\\${subdir}"${M} # PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M}
# PROP Output_Dir "Debug\\${subdir}"${M} # PROP Output_Dir "SH4Dbg\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Release"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Release"${M}
# PROP Intermediate_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "SH3Rel\\${subdir}"${M}
# PROP Output_Dir "Release\\${subdir}"${M} # PROP Output_Dir "SH3Rel\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Debug"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Debug"${M}
# PROP Intermediate_Dir "Debug\\${subdir}"${M} # PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M}
# PROP Output_Dir "Debug\\${subdir}"${M} # PROP Output_Dir "SH3Dbg\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Release"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Release"${M}
# PROP Intermediate_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "ARMRel\\${subdir}"${M}
# PROP Output_Dir "Release\\${subdir}"${M} # PROP Output_Dir "ARMRel\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Debug"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Debug"${M}
# PROP Intermediate_Dir "Debug\\${subdir}"${M} # PROP Intermediate_Dir "ARMDbg\\${subdir}"${M}
# PROP Output_Dir "Debug\\${subdir}"${M} # PROP Output_Dir "ARMDbg\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Release"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Release"${M}
# PROP Intermediate_Dir "Release\\${subdir}"${M} # PROP Intermediate_Dir "X86EMRel\\${subdir}"${M}
# PROP Output_Dir "Release\\${subdir}"${M} # PROP Output_Dir "X86EMRel\\${subdir}"${M}
!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Debug"${M} !ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Debug"${M}
# PROP Intermediate_Dir "Debug\\${subdir}"${M} # PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M}
# PROP Output_Dir "Debug\\${subdir}"${M} # PROP Output_Dir "X86EMDbg\\${subdir}"${M}
!ENDIF${M} !ENDIF${M}
# End Source File${M} # End Source File${M}
EOF EOF
...@@ -158,10 +168,7 @@ EOF ...@@ -158,10 +168,7 @@ EOF
done done
cat >> ${target} << EOF cat >> ${target} << EOF
# End Group${M} # End Group${M}
# End Group${M}
EOF EOF
# The modules
echo 'no modules yet'
# The headers # The headers
cat >> ${target} << EOF cat >> ${target} << EOF
# Begin Group "Header Files"${M} # Begin Group "Header Files"${M}
...@@ -189,6 +196,58 @@ EOF ...@@ -189,6 +196,58 @@ EOF
cat >> ${target} << EOF cat >> ${target} << EOF
# End Group${M} # End Group${M}
# End Group${M} # End Group${M}
# End Target${M}
# End Project${M}
EOF
done
# plugins files
for target in evc/plugins.vcp msvc/plugins.dsp
do
rm -f ${target}
# Top of the project file
cat ${target}.in > ${target}
# The source files
cat >> ${target} << EOF
# Begin Group "Source Files"${M}
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
# End Group${M}
EOF
# The headers
cat >> ${target} << EOF
# Begin Group "Header Files"${M}
# PROP Default_Filter "h;hpp;hxx;hm;inl"${M}
# End Group${M}
# End Target${M}
# End Project${M}
EOF
done
# vlc files
for target in evc/vlc.vcp msvc/vlc.dsp
do
rm -f ${target}
# Top of the project file
cat ${target}.in > ${target}
# The source files
cat >> ${target} << EOF
# Begin Group "Source Files"${M}
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M}
# Begin Source File${M}
EOF
if test "${target}" = "evc/vlc.vcp"
then
cat >> ${target} << EOF
SOURCE="..\\evc\\vlc.c"${M}
EOF
else
cat >> ${target} << EOF
SOURCE="..\\src\\vlc.c"${M}
EOF
fi
cat >> ${target} << EOF
# End Source File${M}
# End Group${M}
EOF EOF
# Bottom of the project file - handles resource files too # Bottom of the project file - handles resource files too
cat ${target}.out >> ${target} cat ${target}.out >> ${target}
...@@ -200,10 +259,8 @@ fi ...@@ -200,10 +259,8 @@ fi
## ##
## Update the potfiles because no one ever does it ## Update the potfiles because no one ever does it
## ##
if test "$do_po" = "no" if test "$do_po" = "yes"
then then
echo "not updating potfiles. use --update-po to force doing it."
else
cd po cd po
make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//' make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
cd .. cd ..
......
doc/fortunes.txt
View file @ d1296b32
...@@ -367,3 +367,9 @@ the Boston strangler is to the woman home alone. ...@@ -367,3 +367,9 @@ the Boston strangler is to the woman home alone.
-- #videolan -- #videolan
% %
<sam> dudes, you'll hate me again: bootstrap will now need an argument :)
<Dnumgis> sam: hate you already
<gibalou> sam: don't worry sam, we already hated you ;)
-- #videolan
%
evc/libvlc.vcp 0 → 100644
View file @ d1296b32
This diff is collapsed.
evc/libvlc.vcp.in 0 → 100644
View file @ d1296b32
This diff is collapsed.
evc/plugins.vcp 0 → 100644
View file @ d1296b32
This diff is collapsed.
evc/plugins.vcp.in 0 → 100644
View file @ d1296b32
This diff is collapsed.
evc/vlc.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc.c: the vlc player, WinCE version * vlc.c: the vlc player, WinCE version
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: vlc.c,v 1.1 2002/11/13 15:28:24 sam Exp $ * $Id: vlc.c,v 1.2 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -88,7 +88,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -88,7 +88,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
window = CreateWindow( L"VLC", pwz_title, window = CreateWindow( L"VLC", pwz_title,
WS_VISIBLE | WS_SIZEBOX | WS_CAPTION, WS_VISIBLE | WS_SIZEBOX | WS_CAPTION,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT, //CW_USEDEFAULT, CW_USEDEFAULT,
200,100,
NULL, NULL, hInst, NULL ); NULL, NULL, hInst, NULL );
ShowWindow( window, nCmdShow ); ShowWindow( window, nCmdShow );
...@@ -218,7 +219,7 @@ static long FAR PASCAL WndProc ( HWND hWnd, UINT message, ...@@ -218,7 +219,7 @@ static long FAR PASCAL WndProc ( HWND hWnd, UINT message,
case WM_CREATE: case WM_CREATE:
hwndCB = CommandBar_Create(hInst, hWnd, 1); hwndCB = CommandBar_Create(hInst, hWnd, 1);
CommandBar_InsertMenubar(hwndCB, hInst, IDM_MENU, 0); CommandBar_InsertMenubar(hwndCB, hInst, IDM_MENU, 0);
CommandBar_AddAdornments(hwndCB, 0, 0); //CommandBar_AddAdornments(hwndCB, 0, 0);
break; break;
case WM_PAINT: case WM_PAINT:
{ {
......
evc/vlc.vcp
View file @ d1296b32
This diff is collapsed.
evc/vlc.vcw
View file @ d1296b32
...@@ -3,6 +3,45 @@ Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00 ...@@ -3,6 +3,45 @@ Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
############################################################################### ###############################################################################
Project: "libvlc"=.\libvlc.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugin_foo"=.\plugin_foo\plugin_foo.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugins"=.\plugins.vcp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libvlc
End Project Dependency
}}}
###############################################################################
Project: "vlc"=.\vlc.vcp - Package Owner=<4> Project: "vlc"=.\vlc.vcp - Package Owner=<4>
Package=<5> Package=<5>
...@@ -11,6 +50,9 @@ Package=<5> ...@@ -11,6 +50,9 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency
Project_Dep_Name libvlc
End Project Dependency
}}} }}}
############################################################################### ###############################################################################
......
include/aout_internal.h
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_internal.h : internal defines for audio output * aout_internal.h : internal defines for audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: aout_internal.h,v 1.32 2002/11/11 22:27:00 gbazin Exp $ * $Id: aout_internal.h,v 1.33 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -54,8 +54,8 @@ typedef struct aout_alloc_t ...@@ -54,8 +54,8 @@ typedef struct aout_alloc_t
else \ else \
{ \ { \
int i_alloc_size; \ int i_alloc_size; \
i_alloc_size = (uint64_t)(p_alloc)->i_bytes_per_sec \ i_alloc_size = (int)( (uint64_t)(p_alloc)->i_bytes_per_sec \
* (i_nb_usec) / 1000000 + 1; \ * (i_nb_usec) / 1000000 + 1 ); \
ALLOCA_TEST( p_alloc, p_new_buffer ) \ ALLOCA_TEST( p_alloc, p_new_buffer ) \
{ \ { \
(p_new_buffer) = malloc( i_alloc_size + sizeof(aout_buffer_t) );\ (p_new_buffer) = malloc( i_alloc_size + sizeof(aout_buffer_t) );\
......
msvc/config.h
View file @ d1296b32
...@@ -506,3 +506,5 @@ ...@@ -506,3 +506,5 @@
#define HAVE_GETENV 1 #define HAVE_GETENV 1
#define HAVE_ATOF 1
msvc/libvlc.dsp 0 → 100644
View file @ d1296b32
This diff is collapsed.
msvc/libvlc.dsp.in 0 → 100644
View file @ d1296b32
# Microsoft Developer Studio Project File - Name="libvlc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libvlc - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libvlc.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libvlc.mak" CFG="libvlc - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libvlc - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libvlc - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libvlc - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libvlc - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "libvlc - Win32 Release"
# Name "libvlc - Win32 Debug"
msvc/plugins.dsp 0 → 100644
View file @ d1296b32
# Microsoft Developer Studio Project File - Name="plugins" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=plugins - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "plugins.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "plugins.mak" CFG="plugins - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "plugins - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "plugins - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "plugins - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD -I..\include /c
# ADD BASE RSC /l 0x414 /d "NDEBUG"
# ADD RSC /l 0x414 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "plugins - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ -I..\include /c
# ADD BASE RSC /l 0x414 /d "_DEBUG"
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
# Name "plugins - Win32 Release"
# Name "plugins - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# End Target
# End Project
msvc/plugins.dsp.in 0 → 100644
View file @ d1296b32
# Microsoft Developer Studio Project File - Name="plugins" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=plugins - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "plugins.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "plugins.mak" CFG="plugins - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "plugins - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "plugins - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "plugins - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD -I..\include /c
# ADD BASE RSC /l 0x414 /d "NDEBUG"
# ADD RSC /l 0x414 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "plugins - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ -I..\include /c
# ADD BASE RSC /l 0x414 /d "_DEBUG"
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib netapi32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
# Name "plugins - Win32 Release"
# Name "plugins - Win32 Debug"
msvc/vlc.dsp
View file @ d1296b32
This diff is collapsed.
msvc/vlc.dsp.in
View file @ d1296b32
...@@ -42,7 +42,7 @@ RSC=rc.exe ...@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD -I..\include /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x414 /d "NDEBUG" # ADD BASE RSC /l 0x414 /d "NDEBUG"
# ADD RSC /l 0x414 /d "NDEBUG" # ADD RSC /l 0x414 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -66,7 +66,7 @@ LINK32=link.exe ...@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ -I..\include /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x414 /d "_DEBUG" # ADD BASE RSC /l 0x414 /d "_DEBUG"
# ADD RSC /l 0x809 /i "../" /d "_DEBUG" # ADD RSC /l 0x809 /i "../" /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
msvc/vlc.dsw
View file @ d1296b32
...@@ -3,6 +3,30 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ...@@ -3,6 +3,30 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
############################################################################### ###############################################################################
Project: "libvlc"=.\libvlc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "plugins"=.\plugins.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "vlc"=.\vlc.dsp - Package Owner=<4> Project: "vlc"=.\vlc.dsp - Package Owner=<4>
Package=<5> Package=<5>
...@@ -11,6 +35,9 @@ Package=<5> ...@@ -11,6 +35,9 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency
Project_Dep_Name libvlc
End Project Dependency
}}} }}}
############################################################################### ###############################################################################
......
share/vlc_wince_rc.rc
View file @ d1296b32
...@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US ...@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_NIOUP ICON DISCARDABLE "nioup.ICO" IDI_NIOUP ICON DISCARDABLE "vlc48x48.ico"
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
......
src/audio_output/common.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* common.c : audio output management of common data structures * common.c : audio output management of common data structures
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: common.c,v 1.7 2002/11/12 13:57:13 sam Exp $ * $Id: common.c,v 1.8 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -404,7 +404,7 @@ mtime_t aout_DateIncrement( audio_date_t * p_date, u32 i_nb_samples ) ...@@ -404,7 +404,7 @@ mtime_t aout_DateIncrement( audio_date_t * p_date, u32 i_nb_samples )
{ {
mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000; mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000;
p_date->date += i_dividend / p_date->i_divider; p_date->date += i_dividend / p_date->i_divider;
p_date->i_remainder += i_dividend % p_date->i_divider; p_date->i_remainder += (int)(i_dividend % p_date->i_divider);
if ( p_date->i_remainder >= p_date->i_divider ) if ( p_date->i_remainder >= p_date->i_divider )
{ {
/* This is Bresenham algorithm. */ /* This is Bresenham algorithm. */
......
src/audio_output/input.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input.c : internal management of input streams for the audio output * input.c : internal management of input streams for the audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: input.c,v 1.20 2002/11/11 22:27:00 gbazin Exp $ * $Id: input.c,v 1.21 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -214,7 +214,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -214,7 +214,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
mtime_t drift = p_buffer->start_date - start_date; mtime_t drift = p_buffer->start_date - start_date;
p_input->i_resamp_start_date = mdate(); p_input->i_resamp_start_date = mdate();
p_input->i_resamp_start_drift = drift; p_input->i_resamp_start_drift = (int)drift;
if ( drift > 0 ) if ( drift > 0 )
p_input->i_resampling_type = AOUT_RESAMPLING_DOWN; p_input->i_resampling_type = AOUT_RESAMPLING_DOWN;
...@@ -251,7 +251,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -251,7 +251,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
msg_Warn( p_aout, "resampling stopped after "I64Fi" usec", msg_Warn( p_aout, "resampling stopped after "I64Fi" usec",
mdate() - p_input->i_resamp_start_date ); mdate() - p_input->i_resamp_start_date );
} }
else if( abs( p_buffer->start_date - start_date ) < else if( abs( (int)(p_buffer->start_date - start_date) ) <
abs( p_input->i_resamp_start_drift ) / 2 ) abs( p_input->i_resamp_start_drift ) / 2 )
{ {
/* if we reduced the drift from half, then it is time to switch /* if we reduced the drift from half, then it is time to switch
...@@ -263,7 +263,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -263,7 +263,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
p_input->i_resamp_start_drift = 0; p_input->i_resamp_start_drift = 0;
} }
else if( p_input->i_resamp_start_drift && else if( p_input->i_resamp_start_drift &&
( abs( p_buffer->start_date - start_date ) > ( abs( (int)(p_buffer->start_date - start_date) ) >
abs( p_input->i_resamp_start_drift ) * 3 / 2 ) ) abs( p_input->i_resamp_start_drift ) * 3 / 2 ) )
{ {
/* If the drift is increasing and not decreasing, than something /* If the drift is increasing and not decreasing, than something
......
src/audio_output/intf.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.c : audio output API towards the interface modules * intf.c : audio output API towards the interface modules
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: intf.c,v 1.5 2002/10/20 12:23:48 massiot Exp $ * $Id: intf.c,v 1.6 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -213,7 +213,7 @@ int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps, ...@@ -213,7 +213,7 @@ int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps,
/* Meant to be called by the output plug-in's Open(). */ /* Meant to be called by the output plug-in's Open(). */
void aout_VolumeSoftInit( aout_instance_t * p_aout ) void aout_VolumeSoftInit( aout_instance_t * p_aout )
{ {
int i_volume; audio_volume_t i_volume;
p_aout->output.pf_volume_infos = aout_VolumeSoftInfos; p_aout->output.pf_volume_infos = aout_VolumeSoftInfos;
p_aout->output.pf_volume_get = aout_VolumeSoftGet; p_aout->output.pf_volume_get = aout_VolumeSoftGet;
......
src/audio_output/mixer.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mixer.c : audio output mixing operations * mixer.c : audio output mixing operations
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: mixer.c,v 1.19 2002/11/08 10:26:53 gbazin Exp $ * $Id: mixer.c,v 1.20 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -208,7 +208,7 @@ static int MixBuffer( aout_instance_t * p_aout ) ...@@ -208,7 +208,7 @@ static int MixBuffer( aout_instance_t * p_aout )
{ {
/* Additionally check that p_first_byte_to_mix is well /* Additionally check that p_first_byte_to_mix is well
* located. */ * located. */
unsigned long i_nb_bytes = (start_date - p_buffer->start_date) mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
* p_aout->mixer.mixer.i_bytes_per_frame * p_aout->mixer.mixer.i_bytes_per_frame
* p_aout->mixer.mixer.i_rate * p_aout->mixer.mixer.i_rate
/ p_aout->mixer.mixer.i_frame_length / p_aout->mixer.mixer.i_frame_length
......
src/extras/dirent.c
View file @ d1296b32
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
* Significantly revised and rewinddir, seekdir and telldir added by Colin * Significantly revised and rewinddir, seekdir and telldir added by Colin
* Peters <colin@fu.is.saga-u.ac.jp> * Peters <colin@fu.is.saga-u.ac.jp>
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* $Author: sam $ * $Author: sam $
* $Date: 2002/11/11 14:39:12 $ * $Date: 2002/11/13 20:51:04 $
* *
*/ */
...@@ -181,7 +181,7 @@ readdir (DIR * dirp) ...@@ -181,7 +181,7 @@ readdir (DIR * dirp)
{ {
/* We haven't started the search yet. */ /* We haven't started the search yet. */
/* Start the search */ /* Start the search */
dirp->dd_handle = FindFirstFile (dirp->dd_name, &(dirp->dd_dta)); dirp->dd_handle = (long)FindFirstFile (dirp->dd_name, &(dirp->dd_dta));
if (dirp->dd_handle == -1) if (dirp->dd_handle == -1)
{ {
...@@ -197,10 +197,10 @@ readdir (DIR * dirp) ...@@ -197,10 +197,10 @@ readdir (DIR * dirp)
else else
{ {
/* Get the next search entry. */ /* Get the next search entry. */
if (FindNextFile (dirp->dd_handle, &(dirp->dd_dta))) if (FindNextFile ((HANDLE)dirp->dd_handle, &(dirp->dd_dta)))
{ {
/* We are off the end or otherwise error. */ /* We are off the end or otherwise error. */
FindClose (dirp->dd_handle); FindClose ((HANDLE)dirp->dd_handle);
dirp->dd_handle = -1; dirp->dd_handle = -1;
dirp->dd_stat = -1; dirp->dd_stat = -1;
} }
...@@ -246,7 +246,7 @@ closedir (DIR * dirp) ...@@ -246,7 +246,7 @@ closedir (DIR * dirp)
if (dirp->dd_handle != -1) if (dirp->dd_handle != -1)
{ {
rc = FindClose (dirp->dd_handle); rc = FindClose ((HANDLE)dirp->dd_handle);
} }
/* Delete the dir structure. */ /* Delete the dir structure. */
...@@ -274,7 +274,7 @@ rewinddir (DIR * dirp) ...@@ -274,7 +274,7 @@ rewinddir (DIR * dirp)
if (dirp->dd_handle != -1) if (dirp->dd_handle != -1)
{ {
FindClose (dirp->dd_handle); FindClose ((HANDLE)dirp->dd_handle);
} }
dirp->dd_handle = -1; dirp->dd_handle = -1;
...@@ -331,7 +331,7 @@ seekdir (DIR * dirp, long lPos) ...@@ -331,7 +331,7 @@ seekdir (DIR * dirp, long lPos)
/* Seek past end. */ /* Seek past end. */
if (dirp->dd_handle != -1) if (dirp->dd_handle != -1)
{ {
FindClose (dirp->dd_handle); FindClose ((HANDLE)dirp->dd_handle);
} }
dirp->dd_handle = -1; dirp->dd_handle = -1;
dirp->dd_stat = -1; dirp->dd_stat = -1;
......
src/extras/libc.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libc.c: Extra libc function for some systems. * libc.c: Extra libc function for some systems.
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: libc.c,v 1.2 2002/11/12 10:44:04 gbazin Exp $ * $Id: libc.c,v 1.3 2002/11/13 20:51:04 sam Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -150,7 +150,7 @@ double atof( const char *nptr ) ...@@ -150,7 +150,7 @@ double atof( const char *nptr )
#if !defined( HAVE_LSEEK ) #if !defined( HAVE_LSEEK )
off_t lseek( int fildes, off_t offset, int whence ) off_t lseek( int fildes, off_t offset, int whence )
{ {
return SetFilePointer( (HANDLE)fildes, offset, NULL, whence ); return SetFilePointer( (HANDLE)fildes, (long)offset, NULL, whence );
} }
#endif #endif
src/input/input_ext-dec.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ext-dec.c: services to the decoders * input_ext-dec.c: services to the decoders
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_ext-dec.c,v 1.41 2002/11/11 14:39:12 sam Exp $ * $Id: input_ext-dec.c,v 1.42 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -203,7 +203,7 @@ void BitstreamNextDataPacket( bit_stream_t * p_bit_stream ) ...@@ -203,7 +203,7 @@ void BitstreamNextDataPacket( bit_stream_t * p_bit_stream )
u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits )
{ {
/* We just fill in the bit buffer. */ /* We just fill in the bit buffer. */
while( p_bit_stream->fifo.i_available < i_bits ) while( (unsigned int)p_bit_stream->fifo.i_available < i_bits )
{ {
if( p_bit_stream->p_byte < p_bit_stream->p_end ) if( p_bit_stream->p_byte < p_bit_stream->p_end )
{ {
...@@ -221,7 +221,7 @@ u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) ...@@ -221,7 +221,7 @@ u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits )
/* We are not aligned anymore. */ /* We are not aligned anymore. */
if( ((ptrdiff_t)p_bit_stream->p_byte if( ((ptrdiff_t)p_bit_stream->p_byte
& (sizeof(WORD_TYPE) - 1)) * 8 & (sizeof(WORD_TYPE) - 1)) * 8
< p_bit_stream->fifo.i_available ) < (unsigned int)p_bit_stream->fifo.i_available )
{ {
/* We are not aligned, and won't be. Copy the first word /* We are not aligned, and won't be. Copy the first word
* of the packet in a temporary buffer, and we'll see * of the packet in a temporary buffer, and we'll see
......
src/input/input_ext-plugins.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ext-plugins.c: useful functions for access and demux plug-ins * input_ext-plugins.c: useful functions for access and demux plug-ins
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: input_ext-plugins.c,v 1.23 2002/11/12 13:57:13 sam Exp $ * $Id: input_ext-plugins.c,v 1.24 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -395,8 +395,8 @@ static inline pes_packet_t * NewPES( input_buffers_t * p_buffers ) ...@@ -395,8 +395,8 @@ static inline pes_packet_t * NewPES( input_buffers_t * p_buffers )
} }
p_pes->p_next = NULL; p_pes->p_next = NULL;
p_pes->b_data_alignment = p_pes->b_discontinuity = p_pes->b_data_alignment = p_pes->b_discontinuity = VLC_FALSE;
p_pes->i_pts = p_pes->i_dts = 0; p_pes->i_pts = p_pes->i_dts = 0;
p_pes->p_first = p_pes->p_last = NULL; p_pes->p_first = p_pes->p_last = NULL;
p_pes->i_pes_size = 0; p_pes->i_pes_size = 0;
p_pes->i_nb_data = 0; p_pes->i_nb_data = 0;
...@@ -518,10 +518,10 @@ ssize_t input_FillBuffer( input_thread_t * p_input ) ...@@ -518,10 +518,10 @@ ssize_t input_FillBuffer( input_thread_t * p_input )
*****************************************************************************/ *****************************************************************************/
ssize_t input_Peek( input_thread_t * p_input, byte_t ** pp_byte, size_t i_size ) ssize_t input_Peek( input_thread_t * p_input, byte_t ** pp_byte, size_t i_size )
{ {
if( p_input->p_last_data - p_input->p_current_data < i_size ) if( p_input->p_last_data - p_input->p_current_data < (ptrdiff_t)i_size )
{ {
/* Go to the next buffer */ /* Go to the next buffer */
ssize_t i_ret = input_FillBuffer( p_input ); size_t i_ret = input_FillBuffer( p_input );
if( i_size == -1 ) if( i_size == -1 )
{ {
...@@ -543,10 +543,10 @@ ssize_t input_Peek( input_thread_t * p_input, byte_t ** pp_byte, size_t i_size ) ...@@ -543,10 +543,10 @@ ssize_t input_Peek( input_thread_t * p_input, byte_t ** pp_byte, size_t i_size )
ssize_t input_SplitBuffer( input_thread_t * p_input, ssize_t input_SplitBuffer( input_thread_t * p_input,
data_packet_t ** pp_data, size_t i_size ) data_packet_t ** pp_data, size_t i_size )
{ {
if( p_input->p_last_data - p_input->p_current_data < i_size ) if( p_input->p_last_data - p_input->p_current_data < (ptrdiff_t)i_size )
{ {
/* Go to the next buffer */ /* Go to the next buffer */
ssize_t i_ret = input_FillBuffer( p_input ); size_t i_ret = input_FillBuffer( p_input );
if( i_ret == -1 ) if( i_ret == -1 )
{ {
......
src/interface/intf_eject.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_eject.c: CD/DVD-ROM ejection handling functions * intf_eject.c: CD/DVD-ROM ejection handling functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: intf_eject.c,v 1.17 2002/11/11 14:39:12 sam Exp $ * $Id: intf_eject.c,v 1.18 2002/11/13 20:51:05 sam Exp $
* *
* Author: Julien Blache <jb@technologeek.org> for the Linux part * Author: Julien Blache <jb@technologeek.org> for the Linux part
* with code taken from the Linux "eject" command * with code taken from the Linux "eject" command
...@@ -109,7 +109,7 @@ static int EjectSCSI ( int i_fd ); ...@@ -109,7 +109,7 @@ static int EjectSCSI ( int i_fd );
*****************************************************************************/ *****************************************************************************/
int __intf_Eject( vlc_object_t *p_this, const char *psz_device ) int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
{ {
int i_ret; int i_ret = VLC_SUCCESS;
#ifdef SYS_DARWIN #ifdef SYS_DARWIN
FILE *p_eject; FILE *p_eject;
...@@ -152,11 +152,11 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device ) ...@@ -152,11 +152,11 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
} }
} }
return 1; return VLC_EGENERIC;
#elif defined(UNDER_CE) #elif defined(UNDER_CE)
msg_Warn( p_this, "CD-Rom ejection unsupported on this platform" ); msg_Warn( p_this, "CD-Rom ejection unsupported on this platform" );
return 1; return i_ret;
#elif defined(WIN32) #elif defined(WIN32)
HANDLE h_drive ; HANDLE h_drive ;
......
src/misc/configuration.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration * configuration.c management of the modules configuration
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.45 2002/11/11 14:39:12 sam Exp $ * $Id: configuration.c,v 1.46 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#endif #endif
#if defined(HAVE_GETPWUID) #if defined(HAVE_GETPWUID)
#include <pwd.h> /* getpwuid() */ # include <pwd.h> /* getpwuid() */
#endif #endif
#if defined( HAVE_SYS_STAT_H ) #if defined( HAVE_SYS_STAT_H )
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
#if defined( HAVE_SYS_TYPES_H ) #if defined( HAVE_SYS_TYPES_H )
# include <sys/types.h> # include <sys/types.h>
#endif #endif
#if defined( WIN32 ) && !defined( UNDER_CE )
# include <direct.h>
#endif
/***************************************************************************** /*****************************************************************************
* config_GetInt: get the value of an int variable * config_GetInt: get the value of an int variable
...@@ -525,7 +528,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name ) ...@@ -525,7 +528,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{ {
if( (line[0] == '[') if( (line[0] == '[')
&& (p_index = strchr(line,']')) && (p_index = strchr(line,']'))
&& (p_index - &line[1] == strlen((*pp_parser)->psz_object_name)) && (p_index - &line[1]
== (int)strlen((*pp_parser)->psz_object_name))
&& !memcmp( &line[1], (*pp_parser)->psz_object_name, && !memcmp( &line[1], (*pp_parser)->psz_object_name,
strlen((*pp_parser)->psz_object_name) ) ) strlen((*pp_parser)->psz_object_name) ) )
{ {
...@@ -762,9 +766,9 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name ) ...@@ -762,9 +766,9 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
pp_parser++ ) pp_parser++ )
{ {
if( ((p_index2 - &p_line[1]) if( ((p_index2 - &p_line[1])
== strlen((*pp_parser)->psz_object_name) ) && == (int)strlen((*pp_parser)->psz_object_name) )
!memcmp( &p_line[1], (*pp_parser)->psz_object_name, && !memcmp( &p_line[1], (*pp_parser)->psz_object_name,
strlen((*pp_parser)->psz_object_name) ) ) strlen((*pp_parser)->psz_object_name) ) )
{ {
if( !psz_module_name ) if( !psz_module_name )
break; break;
......
src/misc/iso_lang.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* iso_lang.c: function to decode language code (in dvd or a52 for instance). * iso_lang.c: function to decode language code (in dvd or a52 for instance).
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: iso_lang.c,v 1.7 2002/11/10 18:04:24 sam Exp $ * $Id: iso_lang.c,v 1.8 2002/11/13 20:51:05 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
...@@ -57,7 +57,7 @@ const char * DecodeLanguage( u16 i_code ) ...@@ -57,7 +57,7 @@ const char * DecodeLanguage( u16 i_code )
u8 psz_code[3]; u8 psz_code[3];
psz_code[0] = i_code >> 8; psz_code[0] = i_code >> 8;
psz_code[1] = i_code; psz_code[1] = i_code & 0xff;
psz_code[2] = '\0'; psz_code[2] = '\0';
for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ ) for( p_lang = p_languages; p_lang->psz_eng_name; p_lang++ )
......
src/misc/netutils.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* netutils.c: various network functions * netutils.c: various network functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: netutils.c,v 1.76 2002/11/11 14:39:12 sam Exp $ * $Id: netutils.c,v 1.77 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr> * Benoit Steiner <benny@via.ecp.fr>
...@@ -214,6 +214,7 @@ int __network_ChannelJoin( vlc_object_t *p_this, int i_channel ) ...@@ -214,6 +214,7 @@ int __network_ChannelJoin( vlc_object_t *p_this, int i_channel )
socket_desc.i_server_port = i_port; socket_desc.i_server_port = i_port;
/* Find an appropriate network module */ /* Find an appropriate network module */
p_this->p_private = (void*) &socket_desc;
p_network = module_Need( p_this, "network", psz_network/*, &socket_desc*/ ); p_network = module_Need( p_this, "network", psz_network/*, &socket_desc*/ );
if( p_network == NULL ) if( p_network == NULL )
{ {
......
src/playlist/playlist.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions * playlist.c : Playlist management functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.20 2002/11/13 12:58:19 gbazin Exp $ * $Id: playlist.c,v 1.21 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -416,7 +416,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg ) ...@@ -416,7 +416,7 @@ static void SkipItem( playlist_t *p_playlist, int i_arg )
/* Increment */ /* Increment */
if( b_random ) if( b_random )
{ {
srand( mdate() ); srand( (unsigned int)mdate() );
/* Simple random stuff - we cheat a bit to minimize the chances to /* Simple random stuff - we cheat a bit to minimize the chances to
* get the same index again. */ * get the same index again. */
......
src/video_output/video_output.c
View file @ d1296b32
This diff is collapsed.
src/video_output/video_text.c
View file @ d1296b32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video_text.c : text manipulation functions * video_text.c : text manipulation functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: video_text.c,v 1.39 2002/11/10 23:41:54 sam Exp $ * $Id: video_text.c,v 1.40 2002/11/13 20:51:05 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -440,13 +440,13 @@ void vout_TextSize( vout_font_t *p_font, int i_style, const char *psz_text, int ...@@ -440,13 +440,13 @@ void vout_TextSize( vout_font_t *p_font, int i_style, const char *psz_text, int
void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int i_bytes_per_line, void vout_Print( vout_font_t *p_font, byte_t *p_pic, int i_bytes_per_pixel, int i_bytes_per_line,
u32 i_char_color, u32 i_border_color, u32 i_bg_color, int i_style, const char *psz_text, int i_percent) u32 i_char_color, u32 i_border_color, u32 i_bg_color, int i_style, const char *psz_text, int i_percent)
{ {
byte_t *p_char, *p_border; /* character and border mask data */ byte_t *p_char, *p_border; /* character and border mask data */
int i_char_mask, i_border_mask, i_bg_mask; /* masks */ int i_char_mask, i_border_mask, i_bg_mask; /* masks */
int i_line; /* current line in character */ int i_line; /* current line in character */
int i_byte; /* current byte in character */ int i_byte; /* current byte in character */
int i_interspacing; /* offset between two chars */ int i_interspacing; /* offset between two chars */
int i_font_bytes_per_line, i_font_height; /* font properties */ int i_font_bytes_per_line, i_font_height; /* font properties */
int i_position, i_end; /* current position */ unsigned int i_position, i_end; /* current position */
vout_put_byte_t *p_PutByte; /* PutByte function */ vout_put_byte_t *p_PutByte; /* PutByte function */
/* If no font was loaded, do nothing */ /* If no font was loaded, do nothing */
......
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