Skip to content

V
vlc-2-2
Commit db10e796 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./AUTHORS: added people locations, just for fun.
  * ./configure.in: disabled SSE plugins when using mingw32.
  * ./src/misc/configuration.c: disabled the AltiVec warning message on the
    PowerPC platform because it was misleading.
parent b4bea3cc
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 34 deletions
AUTHORS
View file @ db10e796
......@@ -9,94 +9,113 @@ N: Marc Ariberti
C: marcari
E: marcari@via.ecp.fr
D: communication with channel server
S: France
N: Sigmund Augdal
E: sigmunau@idi.ntnu.no
D: lirc plugin
D: norwegian translation
D: aalib plugin
S: Norway
N: Pierre Baillet
E: oct@zoy.org
C: octplane
D: SDL audio and video output
S: France
N: Jeffrey Baker
E: jwbaker@acm.org
D: port of the ALSA plugin to the ALSA 1.0 API
S: USA, California
N: Ethan C. Baldridge
E: BaldridgeE@cadmus.com
D: directory browsing code in modules.c
S: USA
N: Gildas Bazin
E: gbazin@netcourrier.com
C: gbazin
D: mingw32 port, various win32 fixes
D: DirectX audio and video output
S: Spain
N: Johan Bilien
E: jobi@via.ecp.fr
C: jobi
D: VCD input
S: France
N: Julien Blache
E: jb@technologeek.org
D: Disc ejection code
S: France
N: Emmanuel Blindauer
E: manu@agat.net
D: aRts audio output
S: France
N: Stphane Borel
E: stef@via.ecp.fr
C: stef
D: MPEG video decoder
D: DVD input, IFO parsing, CSS decryption
S: France
N: Arnaud de Bossoreille de Ribou
E: bozo@via.ecp.fr
C: bozo
D: SDL video output
S: France
N: Tony Castley
E: tony@castley.net
C: tcastley
D: BeOS interface, BeOS Video
S: Australia
N: Renaud Dartus
E: reno@via.ecp.fr
C: reno
D: AC3 decoder
S: France
N: Nilmoni Deb
E: ndeb@ece.cmu.edu
D: Minor autoconf and Makefile fixes
S: USA, Pennsylvania
N: Cyril Deguet
E: asmax@via.ecp.fr
C: asmax
D: PS input packet allocator
S: France
N: Colin Delacroix
E: colin@zoy.org
C: colin
D: MacOS X sound support
S: France
N: Boris Dors
E: babal@via.ecp.fr
C: babal
D: Win32 network input
S: France
N: Jean-Marc Dressler
E: polux@via.ecp.fr
C: polux
D: BeOS port
D: MPEG video decoder
S: France
N: Rgis Duchesne
E: regis@via.ecp.fr
C: regis
S: USA, California
N: Henri Fallon
E: henri@via.ecp.fr
......@@ -104,38 +123,46 @@ C: henri
D: ALSA audio output
D: MPEG TS input, input netlist
D: Decoder modularization
S: France
N: Valek Filippov
E: frob@df.ru
D: Russian translation
S: Russia
N: Arnaud Gomes-do-Vale
E: arnaud@carrosse.frmug.org
D: autoconf patches
S: France
N: Thomas Graf
E: tgraf@europe.com
D: gettext support, german translation
S: Switzerland
N: Jean-Philippe Grimaldi
E: jeanphi@via.ecp.fr
C: jeanphi
D: Bug fixes
S: France
N: Alexis Guillard
E: alexis.guillard@bt.com
D: IPv6
S: United Kingdom
N: Shane Harper
E: shanegh@optusnet.com.au
D: SDL plugin fixes and enhancements
D: XVideo video output
D: Gnome and Gtk+ interface enhancements
S: United Kingdom
N: Gal Hendryckx
E: jimmy@via.ecp.fr
C: jimmy
D: IDCT and YUV transformations
S: France
N: Samuel Hocevar
E: sam@zoy.org
......@@ -143,25 +170,30 @@ C: sam
D: playlist and modules system
D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output
D: DVD subtitles decoder
S: France
N: Aaron Holtzman
E: aholtzma@ess.engr.uvic.ca
D: AC3 decoder
D: MPEG video decoder
S: Canada
N: Hans-Peter Jansen
E: hpj@urpla.net
D: patch for module options handling
S: Germany
N: Eugenio Jarosiewicz
E: ej0@cise.ufl.edu
C: ej
D: MacOS X interface, and various fixes
S: USA, Florida
N: Brieuc Jeunhomme
E: bbp@via.ecp.fr
C: bbp
D: Bug fixes
S: France
N: Jon Lech Johansen
E: jon-vl@nanocrew.net
......@@ -169,6 +201,7 @@ C: jlj
D: PS input fixes
D: Win32 DVD input port
D: QNX RTOS plug-in
S: Norway
N: Michel Kaempf
E: maxx@via.ecp.fr
......@@ -176,24 +209,29 @@ C: maxx
D: audio output
D: AC3 decoder
D: MPEG audio decoder
S: France
N: David Kennedy
E: dkennedy@tinytoad.com
D: X11 fullscreen patch
S: Canada
N: yvind Kolbu
E: oyvindk@world-online.no
D: FreeBSD patches
S: Norway
N: Andres Krapf
E: dae@via.ecp.fr
C: dae
D: FreeBSD port and tests
D: KDE interface
S: France
N: Mathias Kretschmer
E: mathias@research.att.com
D: IP Multicast support
S: USA, New Jersey
N: Michel Lespinasse
E: walken@zoy.org
......@@ -201,19 +239,23 @@ C: walken
D: AC3 decoder
D: MPEG audio decoder
D: MPEG video decoder
S: USA, California
N: Paul Mackerras
E: paulus@linuxcare.com.au
D: Altivec IDCT and motion
D: AltiVec IDCT and motion
S: Australia
N: Wade Majors
E: guru@startrek.com
D: BeOS testing, icon integration, debugging and fixes
S: USA, Florida
N: Xavier Marchesini
E: xav@alarue.net
C: xav
D: Win32 fixes
S: France
N: Christophe Massiot
E: massiot@via.ecp.fr
......@@ -222,32 +264,39 @@ D: MPEG PS input
D: bitstream and input core functions
D: MPEG video decoder
D: Many ports
S: France
N: Arkadiusz Miskiewicz
E: misiek@pld.ORG.PL
D: autoconf and Makefile patches
S: Poland
N: Fumio Nakayama
E: endymion@ca2.so-net.ne.jp
D: Japanese translation
S: Japan
N: Florian G. Pflug
E: fgp@phlo.org
C: fgp
D: MacOS X port
S: Austria
N: Olivier Pomel
E: pomel@via.ecp.fr
C: pomel
S: France
N: Jean-Paul Saman
E: jpsaman@wxs.nl
D: libmad plug-in
D: iPAQ port
S: Netherlands
N: Steven M. Schultz
E: sms@TO.GD-ES.COM
D: BSD/OS port
S: USA, California
N: Vincent Seguin
E: seguin@via.ecp.fr
......@@ -256,28 +305,34 @@ D: core vlc structure
D: interface and message queue
D: YUV transformations
D: X11 and GGI video outputs
S: France
N: Richard Shepherd
E: richard@rshepherd.demon.co.uk
C: richards
D: BeOS video output (BBitmap and Overlay)
S: United Kingdom
N: Espen Skoglund
E: esk@ira.uka.de
D: FreeBSD autoconf and Makefile patches
S: Germany
N: Benoit Steiner
E: benny@via.ecp.fr
C: benny
D: MPEG system input
D: network input
S: USA, California
N: Peter Surda
E: shurdeek@panorama.sth.ac.at
D: rc plugin for vlc control through /dev/stdin
S: Austria
N: Olivier Teulire
E: ipkiss@via.ecp.fr
C: ipkiss
D: WIN32 interface
D: Win32 interface
S: France
configure
View file @ db10e796
......@@ -647,7 +647,6 @@ fi
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
......@@ -695,7 +694,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:699: checking host system type" >&5
echo "configure:698: checking host system type" >&5
host_alias=$host
case "$host_alias" in
......@@ -716,7 +715,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:720: checking target system type" >&5
echo "configure:719: checking target system type" >&5
target_alias=$target
case "$target_alias" in
......@@ -734,7 +733,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:738: checking build system type" >&5
echo "configure:737: checking build system type" >&5
build_alias=$build
case "$build_alias" in
......@@ -757,6 +756,7 @@ test "$host_alias" != "$target_alias" &&
program_prefix=${target_alias}-
PACKAGE="vlc"
VERSION="0.3.0"
CODENAME=Ourumov
......@@ -1295,7 +1295,7 @@ fi
ALL_LINGUAS="de fr ja no ru nl"
cat >> confdefs.h <<EOF
#define VLC_PACKAGE "vlc"
#define VLC_PACKAGE "$PACKAGE"
EOF
cat >> confdefs.h <<EOF
......@@ -4468,7 +4468,7 @@ else
fi
done
for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h
for ac_hdr in sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
......@@ -5498,7 +5498,7 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_sse_inline" 1>&6
if test x"$ac_cv_sse_inline" != x"no"; then
if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
cat >> confdefs.h <<\EOF
#define CAN_COMPILE_SSE 1
EOF
......@@ -7790,7 +7790,7 @@ EOF
if test -f conftest.c
then
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o
then
if test "`strings conftest.o | grep BIGenDianSyS`"
......@@ -8010,7 +8010,7 @@ then
fi
cat >> confdefs.h <<EOF
#define VERSION_MESSAGE "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN\n"
#define VERSION_MESSAGE "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN"
EOF
cat >> confdefs.h <<EOF
......@@ -8325,8 +8325,8 @@ s%@TUNING@%$TUNING%g
s%@RELEASE@%$RELEASE%g
s%@MOC@%$MOC%g
s%@BCBUILDER@%$BCBUILDER%g
s%@VLC_PACKAGE@%$VLC_PACKAGE%g
s%@VLC_VERSION@%$VLC_VERSION%g
s%@PACKAGE@%$PACKAGE%g
s%@VERSION@%$VERSION%g
s%@NEED_GETOPT@%$NEED_GETOPT%g
s%@CFLAGS_OPTIM@%$CFLAGS_OPTIM%g
s%@CFLAGS_OPTIM_NODEBUG@%$CFLAGS_OPTIM_NODEBUG%g
......
configure.in
View file @ db10e796
dnl Autoconf settings for vlc
AC_INIT(include/main.h)
AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_SYSTEM
PACKAGE="vlc"
VERSION="0.3.0"
CODENAME=Ourumov
......@@ -41,7 +41,7 @@ fi
dnl Gettext stuff
ALL_LINGUAS="de fr ja no ru nl"
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "vlc", [Package name])
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "$PACKAGE", [Package name])
AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version])
AM_GNU_GETTEXT
......@@ -185,7 +185,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
......@@ -432,7 +432,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[ac_cv_sse_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test x"$ac_cv_sse_inline" != x"no"; then
if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi
......@@ -1313,7 +1313,7 @@ EOF
]
if test -f conftest.c
then
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o
then
if test "`strings conftest.o | grep BIGenDianSyS`"
......@@ -1411,7 +1411,7 @@ fi
dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN\n", [Simple version string])
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
......@@ -1441,8 +1441,8 @@ AC_SUBST(RELEASE)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(BCBUILDER)
AC_SUBST(VLC_PACKAGE)
AC_SUBST(VLC_VERSION)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(NEED_GETOPT)
AC_SUBST(CFLAGS_OPTIM)
......
include/common.h
View file @ db10e796
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.93 2002/04/05 03:27:27 sam Exp $
* $Id: common.h,v 1.94 2002/04/17 11:43:31 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -27,8 +27,13 @@
/*****************************************************************************
* Required system headers
*****************************************************************************/
#include <string.h> /* strerror() */
#include <sys/types.h>
#ifdef HAVE_STRING_H
# include <string.h> /* strerror() */
#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
/*****************************************************************************
* Basic types definitions
......@@ -476,14 +481,21 @@ typedef __int64 off_t;
/*****************************************************************************
* I18n stuff
*****************************************************************************/
#ifndef PACKAGE
#ifndef PACKAGE /* Borland C++ uses this ! */
#define PACKAGE VLC_PACKAGE
#endif
#define VERSION VLC_VERSION
#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ )
#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( MODULE_NAME_IS_gnome )
# include <libintl.h>
#else
# undef _
# define _(String) dgettext (PACKAGE, String)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#elif !defined( MODULE_NAME_IS_gnome )
# define _(String) (String)
# define N_(String) (String)
#endif
......
include/defs.h.in
View file @ db10e796
......@@ -295,6 +295,9 @@
/* Define if you have the <sys/times.h> header file. */
#undef HAVE_SYS_TIMES_H
/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
......
src/interface/main.c
View file @ db10e796
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.178 2002/04/15 14:06:19 jobi Exp $
* $Id: main.c,v 1.179 2002/04/17 11:43:31 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -1057,7 +1057,8 @@ static void Version( void )
ShowConsole();
#endif
intf_Msg( VERSION_MESSAGE
intf_Msg( VERSION_MESSAGE );
intf_Msg(
"This program comes with NO WARRANTY, to the extent permitted by "
"law.\nYou may redistribute it under the terms of the GNU General "
"Public License;\nsee the file named COPYING for details.\n"
......@@ -1141,12 +1142,14 @@ static void IllegalSignalHandler( int i_signal )
sigrelse( i_signal );
#endif
#if defined( __i386__ )
fprintf( stderr, "warning: your CPU has %s instructions, but not your "
"operating system.\n", psz_capability );
fprintf( stderr, " some optimizations will be disabled unless "
"you upgrade your OS\n" );
#ifdef SYS_LINUX
fprintf( stderr, " (for instance Linux kernel 2.4.x or later)" );
# if defined( SYS_LINUX )
fprintf( stderr, " (for instance Linux kernel 2.4.x or later)\n" );
# endif
#endif
longjmp( env, 1 );
......
src/misc/configuration.c
View file @ db10e796
......@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.13 2002/04/02 11:31:36 ipkiss Exp $
* $Id: configuration.c,v 1.14 2002/04/17 11:43:31 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -474,9 +474,10 @@ int config_SaveConfigFile( const char *psz_module_name )
#else
i = mkdir( psz_filename );
#endif
if( i )
if( i && errno != EEXIST )
{
intf_ErrMsg("Couldn't create %s (%s)", psz_filename, strerror(errno));
intf_ErrMsg( "config error: couldn't create %s (%s)",
psz_filename, strerror(errno) );
}
strcat( psz_filename, "/" CONFIG_FILE );
......
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