* updated MSVC++ project.
* small corrections to the LONGTEXT descriptions in main.c.
12 files changed:
E: gbazin@netcourrier.com
C: gbazin
D: mingw32 port, various win32 fixes
E: gbazin@netcourrier.com
C: gbazin
D: mingw32 port, various win32 fixes
-D: DirectX audio and video output
+D: DirectX audio and video output, win32 WaveOut audio output
+D: a52 decoder using liba52
D: Configuration file infrastructure
D: Configuration file infrastructure
N: Johan Bilien
E: jobi@via.ecp.fr
N: Johan Bilien
E: jobi@via.ecp.fr
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
/* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16
+/* iline */
+#define inline __inline
+
/* Simple version string */
#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
/* Simple version string */
#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
int InitModule__MODULE_mpeg_vdec( module_t* );
int ActivateModule__MODULE_mpeg_vdec( module_t* );
int DeactivateModule__MODULE_mpeg_vdec( module_t* );
int InitModule__MODULE_mpeg_vdec( module_t* );
int ActivateModule__MODULE_mpeg_vdec( module_t* );
int DeactivateModule__MODULE_mpeg_vdec( module_t* );
-int InitModule__MODULE_dvd( module_t* );\r
-int ActivateModule__MODULE_dvd( module_t* );\r
-int DeactivateModule__MODULE_dvd( module_t* );\r
-int InitModule__MODULE_gtk( module_t* );\r
-int ActivateModule__MODULE_gtk( module_t* );\r
-int DeactivateModule__MODULE_gtk( module_t* );\r
+int InitModule__MODULE_dvd( module_t* );
+int ActivateModule__MODULE_dvd( module_t* );
+int DeactivateModule__MODULE_dvd( module_t* );
+int InitModule__MODULE_wall( module_t* );
+int ActivateModule__MODULE_wall( module_t* );
+int DeactivateModule__MODULE_wall( module_t* );
#define ALLOCATE_ALL_BUILTINS() \
do \
#define ALLOCATE_ALL_BUILTINS() \
do \
ALLOCATE_BUILTIN(ac3_adec); \
ALLOCATE_BUILTIN(dummy); \
ALLOCATE_BUILTIN(mpeg_vdec); \
ALLOCATE_BUILTIN(ac3_adec); \
ALLOCATE_BUILTIN(dummy); \
ALLOCATE_BUILTIN(mpeg_vdec); \
- ALLOCATE_BUILTIN(dvd); \\r
+ ALLOCATE_BUILTIN(dvd); \
+ ALLOCATE_BUILTIN(wall); \
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
# PROP Ignore_Export_Lib 0\r
# PROP Target_Dir ""\r
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /GZ /I../../include /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /FR /YX /FD /GZ /I../../include /c\r
# ADD BASE RSC /l 0x414 /d "_DEBUG"\r
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"\r
BSC32=bscmake.exe\r
# ADD BASE RSC /l 0x414 /d "_DEBUG"\r
# ADD RSC /l 0x809 /i "../" /d "_DEBUG"\r
BSC32=bscmake.exe\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# PROP Exclude_From_Build 1\r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort\r
\r
!ENDIF \r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort\r
\r
!ENDIF \r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# PROP Exclude_From_Build 1\r
-\r
!ENDIF \r
\r
# End Source File\r
!ENDIF \r
\r
# End Source File\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# PROP Exclude_From_Build 1\r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert\r
\r
!ENDIF \r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert\r
\r
!ENDIF \r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# PROP Exclude_From_Build 1\r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform\r
\r
!ENDIF \r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform\r
\r
!ENDIF \r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
\r
!ELSEIF "$(CFG)" == "vlc - Win32 Debug"\r
\r
-# PROP Exclude_From_Build 1\r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall\r
\r
!ENDIF \r
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall\r
\r
!ENDIF \r
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: clone.c,v 1.1 2002/05/13 19:30:40 sam Exp $
+ * $Id: clone.c,v 1.2 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: deinterlace.c,v 1.9 2002/04/19 13:56:11 sam Exp $
+ * $Id: deinterlace.c,v 1.10 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: distort.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: distort.c,v 1.11 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: invert.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: invert.c,v 1.11 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.9 2002/04/19 13:56:11 sam Exp $
+ * $Id: transform.c,v 1.10 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.16 2002/04/19 13:56:11 sam Exp $
+ * $Id: wall.c,v 1.17 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video_parser.c,v 1.19 2002/05/19 09:37:02 gbazin Exp $
+ * $Id: video_parser.c,v 1.20 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
#define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
#define VPAR_SYNCHRO_LONGTEXT N_( \
#define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
#define VPAR_SYNCHRO_LONGTEXT N_( \
- "If you don't want this video decoder to decode all frames of the video, "\
- "you can specify which synchro algorithm you want to use.")
+ "This allows you to force the synchro algorithm, by directly selecting " \
+ "the types of picture you want to decode. Please bear in mind that if " \
+ "you select more pictures than what your CPU is capable to decode, " \
+ "you won't get anything.")
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.192 2002/05/19 11:02:46 massiot Exp $
+ * $Id: main.c,v 1.193 2002/05/19 12:57:32 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#define INTF_TEXT N_("interface module")
#define INTF_LONGTEXT N_( \
"This option allows you to select the interface used by vlc.\nNote that " \
#define INTF_TEXT N_("interface module")
#define INTF_LONGTEXT N_( \
"This option allows you to select the interface used by vlc.\nNote that " \
- "the default behavior is to automatically select the best method " \
+ "the default behavior is to automatically select the best module " \
"available.")
#define WARNING_TEXT N_("warning level (or use -v, -vv, etc...)")
"available.")
#define WARNING_TEXT N_("warning level (or use -v, -vv, etc...)")
#define DVD_DEV_TEXT N_("DVD device")
#define DVD_DEV_LONGTEXT N_( \
#define DVD_DEV_TEXT N_("DVD device")
#define DVD_DEV_LONGTEXT N_( \
- "This is the default DVD device to use. Under UNIX it is /dev/dvd, under " \
- "Windows it is D:.")
+ "This is the default DVD device to use.")
#define VCD_DEV_TEXT N_("VCD device")
#define VCD_DEV_LONGTEXT N_( \
#define VCD_DEV_TEXT N_("VCD device")
#define VCD_DEV_LONGTEXT N_( \
- "This is the default VCD device to use. Under UNIX it is /dev/dvd, under " \
- "Windows it is D:.")
+ "This is the default VCD device to use.")
#define IPV6_TEXT N_("force IPv6")
#define IPV6_LONGTEXT N_( \
#define IPV6_TEXT N_("force IPv6")
#define IPV6_LONGTEXT N_( \
"This allows you to select the AC3/A52 audio decoder you want to use. " \
"Common choices are builtin and a52.")
"This allows you to select the AC3/A52 audio decoder you want to use. " \
"Common choices are builtin and a52.")
-#define VDEC_SMP_TEXT N_("use additional processors")
-#define VDEC_SMP_LONGTEXT N_( \
- "This option is deprecated.")
-
-#define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
-#define VPAR_SYNCHRO_LONGTEXT N_( \
- "This allows you to force the synchro algorithm, by directly selecting " \
- "the types of picture you want to decode. Please bear in mind that if " \
- "you select more pictures than what your CPU is capable to decode, " \
- "you won't get anything.")
-
#define NOMMX_TEXT N_("disable CPU's MMX support")
#define NOMMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set but you don't want " \
#define NOMMX_TEXT N_("disable CPU's MMX support")
#define NOMMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set but you don't want " \