Skip to content

V
vlc-1.1
Commit 003c2ab3 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Removed unused code (intf_channels.c, keystrokes.h).
  * Put common_win32.h back into common.h -- it wasn't that big and we
    should not multiply header files.
  * Added gettext support by Thomas Graf <reeler@reeler.org>, may be
    broken on other platforms but we'll only see it when I'm finished
    with vout 4 :-)
  * Fixed a segfault on exit when no fast_memcpy module was found.
parent 6dc23238
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4584 additions and 1270 deletions
AUTHORS
View file @ 003c2ab3
......@@ -99,6 +99,10 @@ N: Arnaud Gomes-do-Vale
E: arnaud@carrosse.frmug.org
D: autoconf patches
N: Thomas Graf
E: reeler@reeler.org
D: gettext support, german translation
N: Jean-Philippe Grimaldi
E: jeanphi@via.ecp.fr
C: jeanphi
......
Makefile
View file @ 003c2ab3
......@@ -111,7 +111,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
#
# C Objects
#
INTERFACE := main interface intf_msg intf_playlist intf_channels
INTERFACE := main interface intf_msg intf_playlist
INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_netlist input_clock mpeg_system
VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
......@@ -183,7 +183,7 @@ export
#
# Virtual targets
#
all: Makefile.opts vlc ${ALIASES} vlc.app
all: Makefile.opts vlc ${ALIASES} vlc.app plugins po
Makefile.opts:
@echo "**** No configuration found, running ./configure..."
......@@ -206,7 +206,7 @@ show:
#
# Cleaning rules
#
clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean
clean: libdvdcss-clean libdvdread-clean plugins-clean po-clean vlc-clean
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so* lib/*.a
rm -f plugins/*.so plugins/*.a
......@@ -215,6 +215,9 @@ clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean
libdvdcss-clean:
-cd extras/libdvdcss && $(MAKE) clean
po-clean:
-cd po && $(MAKE) clean
libdvdread-clean:
-cd extras/libdvdread && $(MAKE) clean
......@@ -229,6 +232,7 @@ vlc-clean:
rm -Rf vlc.app
distclean: clean
-cd po && $(MAKE) distclean
rm -f **/*.o **/*~ *.log
rm -f Makefile.opts
rm -f include/defs.h include/config.h include/modules_builtin.h
......@@ -241,9 +245,9 @@ distclean: clean
#
# Install/uninstall rules
#
install: libdvdcss-install vlc-install plugins-install
install: libdvdcss-install vlc-install plugins-install po-install
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall po-uninstall
vlc-install:
mkdir -p $(DESTDIR)$(bindir)
......@@ -280,6 +284,12 @@ libdvdcss-install:
libdvdcss-uninstall:
-cd extras/libdvdcss && $(MAKE) uninstall
po-install:
-cd po && $(MAKE) install
po-uninstall:
-cd po && $(MAKE) uninstall
#
# Package generation rules
#
......@@ -309,11 +319,15 @@ snapshot-common:
find tmp/vlc/extras tmp/vlc/doc \
-type d -name CVS -o -name '.*' -o -name '*.[o]' | \
while read i ; do rm -Rf $$i ; done
# Copy gettext stuff
mkdir tmp/vlc/po
cp po/*.po tmp/vlc/po
for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
# Copy misc files
cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
Makefile Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh install-win32 vlc.spec \
config.sub config.guess \
config.sub config.guess acconfig.h aclocal.m4 mkinstalldirs \
tmp/vlc/
# Copy Debian control files
for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \
......@@ -518,7 +532,7 @@ endif
#
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
......@@ -530,24 +544,30 @@ endif
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
@cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# Built-in modules target
#
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTIN_OBJ): FORCE
cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
@cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# libdvdcss target
#
libdvdcss: Makefile.opts
cd extras/libdvdcss && $(MAKE)
@cd extras/libdvdcss && $(MAKE)
#
# libdvdread target
#
libdvdread: Makefile.opts
cd extras/libdvdread && $(MAKE)
@cd extras/libdvdread && $(MAKE)
#
# gettext target
#
po: FORCE
@cd po && $(MAKE)
Makefile.modules
View file @ 003c2ab3
......@@ -55,4 +55,3 @@ $(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp
$(BUILTIN_CPP): BUILTIN_%.o: %.cpp
$(CC) $(CFLAGS) -DBUILTIN -c -o $@ $<
Makefile.opts.in
View file @ 003c2ab3
......@@ -164,7 +164,10 @@ DEFINE_CONSTANTS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '
DEFINE += $(DEFINE_CONSTANTS)
# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98
# Gettext support
DEFINE += -DLOCALEDIR=\"$(datadir)/locale\"
###############################################################################
# Tuning and other variables - do not change anything except if you know
......
acconfig.h 0 → 100644
View file @ 003c2ab3
#undef ENABLE_NLS
#undef HAVE_LC_MESSAGES
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_STPCPY
#undef PACKAGE
#undef VERSION
aclocal.m4 0 → 100644
View file @ 003c2ab3
This diff is collapsed.
configure
View file @ 003c2ab3
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ 003c2ab3
......@@ -33,6 +33,14 @@ AC_PROG_CC
AC_PROG_CPP
AC_CHECK_TOOL(RANLIB, ranlib, :)
dnl Gettext stuff
PACKAGE="vlc"
VERSION="$VLC_VERSION"
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AM_GNU_GETTEXT
ALL_LINGUAS="de"
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
......@@ -1234,6 +1242,8 @@ AC_SUBST(RELEASE)
AC_SUBST(NEED_GETOPT)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(LCFLAGS)
AC_SUBST(PLCFLAGS)
......@@ -1286,7 +1296,8 @@ AC_SUBST(OBJ_LIBDVDCSS)
AC_SUBST(NEED_LIBDVDCSS)
AC_OUTPUT([Makefile.opts include/config.h])
AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in])
echo "
global configuration
......
include/bytes_swap.h deleted 100644 → 0
View file @ 6dc23238
/*****************************************************************************
* bytes_swap.h: fast routines to swap bytes order.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: bytes_swap.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $
*
* Authors: This code was borrowed from the GNU C Library.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* Swap bytes in 16 bit value. */
#define __bswap_constant_16(x) \
((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
#if defined __GNUC__ && __GNUC__ >= 2
# define __bswap_16(x) \
(__extension__ \
({ register unsigned short int __v; \
if (__builtin_constant_p (x)) \
__v = __bswap_constant_16 (x); \
else \
__asm__ __volatile__ ("rorw $8, %w0" \
: "=r" (__v) \
: "0" ((unsigned short int) (x)) \
: "cc"); \
__v; }))
#else
/* This is better than nothing. */
# define __bswap_16(x) __bswap_constant_16 (x)
#endif
/* Swap bytes in 32 bit value. */
#define __bswap_constant_32(x) \
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#if defined __GNUC__ && __GNUC__ >= 2
/* To swap the bytes in a word the i486 processors and up provide the
`bswap' opcode. On i386 we have to use three instructions. */
# if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__
# define __bswap_32(x) \
(__extension__ \
({ register unsigned int __v; \
if (__builtin_constant_p (x)) \
__v = __bswap_constant_32 (x); \
else \
__asm__ __volatile__ ("rorw $8, %w0;" \
"rorl $16, %0;" \
"rorw $8, %w0" \
: "=r" (__v) \
: "0" ((unsigned int) (x)) \
: "cc"); \
__v; }))
# else
# define __bswap_32(x) \
(__extension__ \
({ register unsigned int __v; \
if (__builtin_constant_p (x)) \
__v = __bswap_constant_32 (x); \
else \
__asm__ __volatile__ ("bswap %0" \
: "=r" (__v) \
: "0" ((unsigned int) (x))); \
__v; }))
# endif
#else
# define __bswap_32(x) __bswap_constant_32 (x)
#endif
#if defined __GNUC__ && __GNUC__ >= 2
/* Swap bytes in 64 bit value. */
#define __bswap_constant_64(x) \
((((x) & 0xff00000000000000ull) >> 56) \
| (((x) & 0x00ff000000000000ull) >> 40) \
| (((x) & 0x0000ff0000000000ull) >> 24) \
| (((x) & 0x000000ff00000000ull) >> 8) \
| (((x) & 0x00000000ff000000ull) << 8) \
| (((x) & 0x0000000000ff0000ull) << 24) \
| (((x) & 0x000000000000ff00ull) << 40) \
| (((x) & 0x00000000000000ffull) << 56))
# define __bswap_64(x) \
(__extension__ \
({ union { __extension__ unsigned long long int __ll; \
unsigned long int __l[2]; } __w, __r; \
if (__builtin_constant_p (x)) \
__r.__ll = __bswap_constant_64 (x); \
else \
{ \
__w.__ll = (x); \
__r.__l[0] = __bswap_32 (__w.__l[1]); \
__r.__l[1] = __bswap_32 (__w.__l[0]); \
} \
__r.__ll; }))
#endif
include/common.h
View file @ 003c2ab3
This diff is collapsed.
include/common_win32.h deleted 100644 → 0
View file @ 6dc23238
/*****************************************************************************
* common_win32.h: common definitions specific to Win32
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common_win32.h,v 1.1 2001/11/25 22:52:21 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/* The ntoh* and hton* bytes swapping functions are provided by winsock
* but for conveniency and speed reasons it is better to implement them
* ourselves. ( several plugins use them and it is too much assle to link
* winsock with each of them ;-)
*/
#undef ntoh32(x)
#undef ntoh16(x)
#undef ntoh64(x)
#undef hton32(x)
#undef hton16(x)
#undef hton64(x)
#ifdef WORDS_BIGENDIAN
# define ntoh32(x) (x)
# define ntoh16(x) (x)
# define ntoh64(x) (x)
# define hton32(x) (x)
# define hton16(x) (x)
# define hton64(x) (x)
#else
# define ntoh32(x) __bswap_32 (x)
# define ntoh16(x) __bswap_16 (x)
# define ntoh64(x) __bswap_32 (x)
# define hton32(x) __bswap_32 (x)
# define hton16(x) __bswap_16 (x)
# define hton64(x) __bswap_32 (x)
#endif
/* win32, cl and icl support */
#if defined( _MSC_VER )
# define __attribute__(x)
# define __inline__ __inline
# define strncasecmp strnicmp
# define strcasecmp stricmp
# define S_ISBLK(m) (0)
# define S_ISCHR(m) (0)
# define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO)
# define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG)
# undef I64C(x)
# define I64C(x) x##i64
#endif
/* several type definitions */
#if defined( __MINGW32__ )
# if !defined( _OFF_T_ )
typedef long long _off_t;
typedef _off_t off_t;
# define _OFF_T_
# else
# define off_t long long
# endif
#endif
#if defined( _MSC_VER )
# if !defined( _OFF_T_DEFINED )
typedef __int64 off_t;
# define _OFF_T_DEFINED
# else
# define off_t __int64
# endif
# define stat _stati64
#endif
#ifndef snprintf
# define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */
#endif
include/config.h.in
View file @ 003c2ab3
......@@ -51,7 +51,7 @@
#define COPYRIGHT_MESSAGE "VideoLAN Client - version @VLC_VERSION@" \
" @VLC_CODENAME@ - (C)1996-2001 VideoLAN"
#define VERSION "@VLC_VERSION@"
#define VLC_VERSION "@VLC_VERSION@"
/*****************************************************************************
* Debugging options - define or undefine symbols
......
include/defs.h.in
View file @ 003c2ab3
/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if using alloca.c. */
#undef C_ALLOCA
/* Define to empty if the keyword does not work. */
#undef const
/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
This function is required for alloca.c support on those systems. */
#undef CRAY_STACKSEG_END
/* Define if you have alloca, as a function or macro. */
#undef HAVE_ALLOCA
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
#undef HAVE_ALLOCA_H
/* Define if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define as __inline if that's what the C compiler calls it. */
#undef inline
/* Define to `long' if <sys/types.h> doesn't define. */
#undef off_t
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown
*/
#undef STACK_DIRECTION
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
......@@ -22,15 +50,62 @@
byte first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
#undef ENABLE_NLS
#undef HAVE_LC_MESSAGES
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_STPCPY
#undef PACKAGE
#undef VERSION
/* Define if you have the __argz_count function. */
#undef HAVE___ARGZ_COUNT
/* Define if you have the __argz_next function. */
#undef HAVE___ARGZ_NEXT
/* Define if you have the __argz_stringify function. */
#undef HAVE___ARGZ_STRINGIFY
/* Define if you have the dcgettext function. */
#undef HAVE_DCGETTEXT
/* Define if you have the feof_unlocked function. */
#undef HAVE_FEOF_UNLOCKED
/* Define if you have the fgets_unlocked function. */
#undef HAVE_FGETS_UNLOCKED
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
/* Define if you have the getegid function. */
#undef HAVE_GETEGID
/* Define if you have the geteuid function. */
#undef HAVE_GETEUID
/* Define if you have the getgid function. */
#undef HAVE_GETGID
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
/* Define if you have the gettimeofday function. */
#undef HAVE_GETTIMEOFDAY
/* Define if you have the getuid function. */
#undef HAVE_GETUID
/* Define if you have the memalign function. */
#undef HAVE_MEMALIGN
/* Define if you have the mempcpy function. */
#undef HAVE_MEMPCPY
/* Define if you have the munmap function. */
#undef HAVE_MUNMAP
/* Define if you have the putenv function. */
#undef HAVE_PUTENV
......@@ -40,9 +115,24 @@
/* Define if you have the setenv function. */
#undef HAVE_SETENV
/* Define if you have the setlocale function. */
#undef HAVE_SETLOCALE
/* Define if you have the sigrelse function. */
#undef HAVE_SIGRELSE
/* Define if you have the stpcpy function. */
#undef HAVE_STPCPY
/* Define if you have the strcasecmp function. */
#undef HAVE_STRCASECMP
/* Define if you have the strchr function. */
#undef HAVE_STRCHR
/* Define if you have the strdup function. */
#undef HAVE_STRDUP
/* Define if you have the strerror function. */
#undef HAVE_STRERROR
......@@ -52,9 +142,15 @@
/* Define if you have the strtol function. */
#undef HAVE_STRTOL
/* Define if you have the strtoul function. */
#undef HAVE_STRTOUL
/* Define if you have the swab function. */
#undef HAVE_SWAB
/* Define if you have the tsearch function. */
#undef HAVE_TSEARCH
/* Define if you have the usleep function. */
#undef HAVE_USLEEP
......@@ -73,9 +169,15 @@
/* Define if you have the <Ph.h> header file. */
#undef HAVE_PH_H
/* Define if you have the <X11/Xlib.h> header file. */
#undef HAVE_X11_XLIB_H
/* Define if you have the <X11/extensions/Xv.h> header file. */
#undef HAVE_X11_EXTENSIONS_XV_H
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
/* Define if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
......@@ -118,27 +220,48 @@
/* Define if you have the <kernel/scheduler.h> header file. */
#undef HAVE_KERNEL_SCHEDULER_H
/* Define if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define if you have the <linux/cdrom.h> header file. */
#undef HAVE_LINUX_CDROM_H
/* Define if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define if you have the <machine/param.h> header file. */
#undef HAVE_MACHINE_PARAM_H
/* Define if you have the <machine/soundcard.h> header file. */
#undef HAVE_MACHINE_SOUNDCARD_H
/* Define if you have the <mad.h> header file. */
#undef HAVE_MAD_H
/* Define if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define if you have the <net/if.h> header file. */
#undef HAVE_NET_IF_H
/* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
/* Define if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
/* Define if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
......@@ -151,6 +274,9 @@
/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
......@@ -172,12 +298,34 @@
/* Define if you have the <winioctl.h> header file. */
#undef HAVE_WINIOCTL_H
/* Define if you have the mad library (-lmad). */
#undef HAVE_LIBMAD
/* Define if you have the pth library (-lpth). */
#undef HAVE_LIBPTH
/* css decryption with player keys */
#undef HAVE_CSSKEYS
/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#undef HAVE_LANGINFO_CODESET
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if translation of program messages to the user's native language
is requested. */
#undef ENABLE_NLS
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* long getopt support */
#undef HAVE_GETOPT_LONG
......
include/input_ext-dec.h
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-dec.h,v 1.41 2001/12/07 18:33:07 sam Exp $
* $Id: input_ext-dec.h,v 1.42 2001/12/10 04:53:10 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr>
......@@ -218,6 +218,10 @@ typedef struct bit_stream_s
u32 UnalignedShowBits( struct bit_stream_s *, unsigned int );
void UnalignedRemoveBits( struct bit_stream_s * );
u32 UnalignedGetBits( struct bit_stream_s *, unsigned int );
#else
# define UnalignedShowBits p_symbols->UnalignedShowBits
# define UnalignedRemoveBits p_symbols->UnalignedRemoveBits
# define UnalignedGetBits p_symbols->UnalignedGetBits
#endif
/*****************************************************************************
......
include/input_ext-intf.h
View file @ 003c2ab3
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.51 2001/12/07 16:47:47 jobi Exp $
* $Id: input_ext-intf.h,v 1.52 2001/12/10 04:53:10 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -325,7 +325,6 @@ typedef struct input_thread_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
#ifndef PLUGIN
struct input_thread_s * input_CreateThread ( struct playlist_item_s *,
int *pi_status );
void input_DestroyThread( struct input_thread_s *, int *pi_status );
......@@ -342,4 +341,4 @@ int input_ChangeArea( struct input_thread_s *, struct input_area_s * );
int input_ToggleGrayscale( struct input_thread_s * );
int input_ToggleMute( struct input_thread_s * );
int input_SetSMP( struct input_thread_s *, int );
#endif
include/input_ext-plugins.h
View file @ 003c2ab3
......@@ -3,7 +3,7 @@
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: input_ext-plugins.h,v 1.7 2001/12/07 16:47:47 jobi Exp $
* $Id: input_ext-plugins.h,v 1.8 2001/12/10 04:53:10 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -40,18 +40,15 @@
/*****************************************************************************
* Prototypes from input_ext-dec.c
*****************************************************************************/
#ifndef PLUGIN
void InitBitstream ( struct bit_stream_s *, struct decoder_fifo_s *,
void (* pf_bitstream_callback)( struct bit_stream_s *,
boolean_t ),
void * p_callback_arg );
void NextDataPacket ( struct bit_stream_s * );
#endif
/*****************************************************************************
* Prototypes from input_programs.c
*****************************************************************************/
#ifndef PLUGIN
int input_InitStream( struct input_thread_s *, size_t );
void input_EndStream ( struct input_thread_s * );
struct pgrm_descriptor_s * input_FindProgram( struct input_thread_s *, u16 );
......@@ -68,12 +65,10 @@ struct es_descriptor_s * input_AddES ( struct input_thread_s *,
void input_DelES ( struct input_thread_s *, struct es_descriptor_s * );
int input_SelectES ( struct input_thread_s *, struct es_descriptor_s * );
int input_UnselectES( struct input_thread_s *, struct es_descriptor_s * );
#endif
/*****************************************************************************
* Prototypes from input_dec.c
*****************************************************************************/
#ifndef PLUGIN
//decoder_capabilities_s * input_ProbeDecoder( void );
vlc_thread_t input_RunDecoder( struct input_thread_s *,
struct es_descriptor_s * );
......@@ -82,12 +77,10 @@ void input_DecodePES ( struct decoder_fifo_s *, struct pes_packet_s * );
void input_EscapeDiscontinuity( struct input_thread_s *,
struct pgrm_descriptor_s * );
void input_EscapeAudioDiscontinuity( struct input_thread_s * );
#endif
/*****************************************************************************
* Prototypes from input_clock.c
*****************************************************************************/
#ifndef PLUGIN
void input_ClockInit( struct pgrm_descriptor_s * );
int input_ClockManageControl( struct input_thread_s *,
struct pgrm_descriptor_s *, mtime_t );
......@@ -95,7 +88,6 @@ void input_ClockManageRef( struct input_thread_s *,
struct pgrm_descriptor_s *, mtime_t );
mtime_t input_ClockGetTS( struct input_thread_s *,
struct pgrm_descriptor_s *, mtime_t );
#endif
/*****************************************************************************
* Create a NULL packet for padding in case of a data loss
......@@ -185,7 +177,6 @@ typedef struct netlist_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
#ifndef PLUGIN
int input_NetlistInit( struct input_thread_s *,
int i_nb_iovec,
int i_nb_data,
......@@ -204,7 +195,6 @@ void input_NetlistDeletePacket( void *,
void input_NetlistDeletePES( void *,
struct pes_packet_s * );
void input_NetlistEnd( struct input_thread_s * );
#endif
/*
......@@ -304,7 +294,6 @@ typedef struct stream_ps_data_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
#ifndef PLUGIN
void input_ParsePES ( struct input_thread_s *, struct es_descriptor_s * );
void input_GatherPES ( struct input_thread_s *, struct data_packet_s *,
struct es_descriptor_s *, boolean_t, boolean_t );
......@@ -314,4 +303,4 @@ void input_DemuxPS ( struct input_thread_s *, struct data_packet_s * );
void input_DemuxTS ( struct input_thread_s *, struct data_packet_s * );
void input_DemuxPSI ( struct input_thread_s *, struct data_packet_s *,
struct es_descriptor_s *, boolean_t, boolean_t );
#endif
include/keystrokes.h deleted 100644 → 0
View file @ 6dc23238
#ifndef VLC_KEYS
#define VLC_KEYS
#define INTF_KEY_QUIT 0x01
#define INTF_KEY_SET_CHANNEL 0x02
#define INTF_KEY_DEC_VOLUME 0x03
#define INTF_KEY_INC_VOLUME 0x04
#define INTF_KEY_TOGGLE_VOLUME 0x05
#define INTF_KEY_DEC_GAMMA 0x06
#define INTF_KEY_INC_GAMMA 0x07
#define INTF_KEY_TOGGLE_GRAYSCALE 0x08
#define INTF_KEY_TOGGLE_INTERFACE 0x09
#define INTF_KEY_TOGGLE_INFO 0x0A
#define INTF_KEY_TOGGLE_SCALING 0x0B
#define INTF_KEY_DUMP_STREAM 0x0C
#define INTF_KEY_UNKNOWN 0x0D
#endif
include/main.h
View file @ 003c2ab3
......@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: main.h,v 1.25 2001/12/07 18:33:07 sam Exp $
* $Id: main.h,v 1.26 2001/12/10 04:53:10 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -65,7 +65,11 @@ typedef struct main_s
p_input_channel_t p_channel; /* channel library data */
} main_t;
#ifndef PLUGIN
extern main_t *p_main;
#else
# define p_main (p_symbols->p_main)
#endif
/*****************************************************************************
* Prototypes - these methods are used to get default values for some threads
......
include/modules_export.h
View file @ 003c2ab3
......@@ -47,6 +47,7 @@
(p_symbols)->mdate = mdate; \
(p_symbols)->network_ChannelCreate = network_ChannelCreate; \
(p_symbols)->network_ChannelJoin = network_ChannelJoin; \
(p_symbols)->input_SetProgram = input_SetProgram; \
(p_symbols)->input_SetStatus = input_SetStatus; \
(p_symbols)->input_Seek = input_Seek; \
(p_symbols)->input_DumpStream = input_DumpStream; \
......@@ -107,7 +108,6 @@
(p_symbols)->intf_DbgMsgImm = _intf_DbgMsgImm;
#ifdef PLUGIN
# define p_main (p_symbols->p_main)
# define p_aout_bank (p_symbols->p_aout_bank)
# define p_vout_bank (p_symbols->p_vout_bank)
......@@ -147,11 +147,12 @@
# define msleep(a) p_symbols->msleep(a)
# define mdate() p_symbols->mdate()
# define network_ChannelCreate() p_symbols->network_ChannelCreate()
# define network_ChannelJoin(a) p_symbols->network_ChannelJoin(a)
# define network_ChannelCreate p_symbols->network_ChannelCreate
# define network_ChannelJoin p_symbols->network_ChannelJoin
# define input_SetStatus(a,b) p_symbols->input_SetStatus(a,b)
# define input_Seek(a,b) p_symbols->input_Seek(a,b)
# define input_SetProgram p_symbols->input_SetProgram
# define input_SetStatus p_symbols->input_SetStatus
# define input_Seek p_symbols->input_Seek
# define input_DumpStream(a) p_symbols->input_DumpStream(a)
# define input_OffsetToTime(a,b,c) p_symbols->input_OffsetToTime(a,b,c)
# define input_ChangeES(a,b,c) p_symbols->input_ChangeES(a,b,c)
......@@ -205,10 +206,6 @@
# define vout_LinkPicture p_symbols->vout_LinkPicture
# define vout_UnlinkPicture p_symbols->vout_UnlinkPicture
# define UnalignedShowBits p_symbols->UnalignedShowBits
# define UnalignedRemoveBits p_symbols->UnalignedRemoveBits
# define UnalignedGetBits p_symbols->UnalignedGetBits
# define DecodeLanguage p_symbols->DecodeLanguage
# define module_Need p_symbols->module_Need
......
include/modules_inner.h
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.7 2001/05/30 17:03:11 sam Exp $
* $Id: modules_inner.h,v 1.8 2001/12/10 04:53:10 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -63,7 +63,7 @@
int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module ) \
{ \
p_module->psz_name = MODULE_STRING; \
p_module->psz_version = VERSION;
p_module->psz_version = VLC_VERSION;
# define MODULE_INIT_STOP \
return( 0 ); \
......@@ -101,7 +101,7 @@
int InitModule ( module_t *p_module ) \
{ \
p_module->psz_name = MODULE_STRING; \
p_module->psz_version = VERSION;
p_module->psz_version = VLC_VERSION;
# define MODULE_INIT_STOP \
return( 0 ); \
......
mkinstalldirs 0 → 100755
View file @ 003c2ab3
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
# $Id: mkinstalldirs,v 1.1 2001/12/10 04:53:10 sam Exp $
errstatus=0
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
fi
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# mkinstalldirs ends here
plugins/ac3_adec/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../ac3_adec.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../ac3_adec.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/ac3_adec/ac3_adec.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_adec.c: ac3 decoder module main file
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_adec.c,v 1.6 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_adec.c,v 1.7 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
*
......@@ -43,13 +43,13 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "input_ext-intf.h" /* MPEG?_AUDIO_ES */
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
#include "ac3_decoder.h"
......
plugins/ac3_adec/ac3_bit_allocate.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_bit_allocate.c: ac3 allocation tables
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ac3_bit_allocate.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_bit_allocate.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -35,12 +35,12 @@
#include "threads.h"
#include "mtime.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
#include "ac3_decoder.h"
......
plugins/ac3_adec/ac3_decoder.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_decoder.c: core ac3 decoder
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_decoder.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_decoder.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -37,12 +37,11 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
......
plugins/ac3_adec/ac3_exponent.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_exponent.c: ac3 exponent calculations
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_exponent.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_exponent.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -37,12 +37,11 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
......
plugins/ac3_adec/ac3_imdct.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_imdct.c: ac3 DCT
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_imdct.c,v 1.5 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_imdct.c,v 1.6 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -38,12 +38,12 @@
#include "threads.h"
#include "mtime.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
#include "ac3_decoder.h"
......
plugins/ac3_adec/ac3_mantissa.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_mantissa.c: ac3 mantissa computation
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_mantissa.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_mantissa.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -37,12 +37,11 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
......
plugins/ac3_adec/ac3_parse.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_parse.c: ac3 parsing procedures
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_parse.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_parse.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -37,12 +37,11 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
......
plugins/ac3_adec/ac3_rematrix.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_rematrix.c: ac3 audio rematrixing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_rematrix.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_rematrix.c,v 1.5 2001/12/10 04:53:10 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -34,12 +34,12 @@
#include "threads.h"
#include "mtime.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "modules.h"
#include "modules_export.h"
#include "ac3_imdct.h"
#include "ac3_downmix.h"
#include "ac3_decoder.h"
......
plugins/ac3_spdif/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../ac3_spdif.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../ac3_spdif.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/ac3_spdif/ac3_iec958.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_iec958.c: ac3 to spdif converter
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ac3_iec958.c,v 1.3 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_iec958.c,v 1.4 2001/12/10 04:53:10 sam Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
......@@ -44,15 +44,14 @@
#include "audio_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "ac3_spdif.h"
#include "ac3_iec958.h"
#include "modules_export.h"
/****************************************************************************
* Local structures and tables
****************************************************************************/
......
plugins/ac3_spdif/ac3_spdif.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ac3_spdif.c,v 1.6 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_spdif.c,v 1.7 2001/12/10 04:53:10 sam Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
......@@ -47,15 +47,15 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "ac3_spdif.h"
#include "ac3_iec958.h"
#include "modules.h"
#include "modules_export.h"
#define FRAME_NB 8
/****************************************************************************
......
plugins/alsa/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../alsa.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -lasound -lm -ldl
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -lasound -lm -ldl
../alsa.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/arts/Makefile
View file @ 003c2ab3
......@@ -29,7 +29,7 @@ include ../../Makefile.modules
#
../arts.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ARTS)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ARTS)
../arts.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/beos/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../beos.so: $(PLUGIN_CPP)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS)
../beos.a: $(BUILTIN_CPP)
ar r $@ $^
......
plugins/chroma/Makefile
View file @ 003c2ab3
......@@ -26,7 +26,7 @@ include ../../Makefile.modules
#
../yuv2rgb8.so: $(PLUGIN_YUV2RGB8)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../yuv2rgb8.a: $(BUILTIN_YUV2RGB8)
ar r $@ $^
......
plugins/directx/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../directx.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DIRECTX)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_DIRECTX)
../directx.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/downmix/Makefile
View file @ 003c2ab3
......@@ -41,21 +41,21 @@ $(BUILTIN_DOWNMIX3DN): BUILTIN_DOWNMIX3DN_%.o: %.c
#
../downmix.so: $(PLUGIN_DOWNMIX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../downmix.a: $(BUILTIN_DOWNMIX)
ar r $@ $^
$(RANLIB) $@
../downmixsse.so: $(PLUGIN_DOWNMIXSSE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../downmixsse.a: $(BUILTIN_DOWNMIXSSE)
ar r $@ $^
$(RANLIB) $@
../downmix3dn.so: $(PLUGIN_DOWNMIX3DN)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../downmix3dn.a: $(BUILTIN_DOWNMIX3DN)
ar r $@ $^
......
plugins/downmix/ac3_downmix_3dn.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_downmix_3dn.c: accelerated 3D Now! ac3 downmix functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ac3_downmix_3dn.c,v 1.7 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_downmix_3dn.c,v 1.8 2001/12/10 04:53:10 sam Exp $
*
* Authors: Renaud Dartus <reno@videolan.org>
*
......@@ -33,7 +33,7 @@
#include "ac3_downmix.h"
static const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068;
const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068;
void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
{
......
plugins/downmix/ac3_downmix_sse.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* ac3_downmix_sse.c: accelerated SSE ac3 downmix functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: ac3_downmix_sse.c,v 1.7 2001/12/09 17:01:36 sam Exp $
* $Id: ac3_downmix_sse.c,v 1.8 2001/12/10 04:53:10 sam Exp $
*
* Authors: Renaud Dartus <reno@videolan.org>
* Aaron Holtzman <aholtzma@engr.uvic.ca>
......@@ -34,7 +34,7 @@
#include "ac3_downmix.h"
static const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068;
const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068;
void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
{
......
plugins/dsp/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../dsp.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../dsp.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/dummy/Makefile
View file @ 003c2ab3
......@@ -27,14 +27,14 @@ include ../../Makefile.modules
#
../null.so: $(PLUGIN_NULL)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../null.a: $(BUILTIN_NULL)
ar r $@ $^
$(RANLIB) $@
../dummy.so: $(PLUGIN_DUMMY)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../dummy.a: $(BUILTIN_DUMMY)
ar r $@ $^
......
plugins/dummy/input_dummy.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* input_dummy.c: dummy input plugin, to manage "vlc:***" special options
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: input_dummy.c,v 1.9 2001/12/07 18:33:07 sam Exp $
* $Id: input_dummy.c,v 1.10 2001/12/10 04:53:10 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -47,14 +47,14 @@
#include "interface.h"
#include "intf_playlist.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
plugins/dvd/Makefile
View file @ 003c2ab3
......@@ -32,14 +32,14 @@ $(BUILTIN_DVD): BUILTIN_%.o: %.c
ifeq (1,$(NEED_LIBDVDCSS))
../dvd.so: libdvdcss $(PLUGIN_DVD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
../dvd.a: libdvdcss $(BUILTIN_DVD)
ar r $@ $(BUILTIN_DVD)
$(RANLIB) $@
else
../dvd.so: $(PLUGIN_DVD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
../dvd.a: $(BUILTIN_DVD)
ar r $@ $(BUILTIN_DVD)
......
plugins/dvd/input_dvd.c
View file @ 003c2ab3
......@@ -10,7 +10,7 @@
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.105 2001/12/07 18:33:07 sam Exp $
* $Id: input_dvd.c,v 1.106 2001/12/10 04:53:10 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -77,9 +77,6 @@
# include "input_iovec.h"
#endif
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......@@ -91,6 +88,9 @@
#include "debug.h"
#include "modules.h"
#include "modules_export.h"
/* how many blocks DVDRead will read in each loop */
#define DVD_BLOCK_READ_ONCE 64
#define DVD_DATA_READ_ONCE (4 * DVD_BLOCK_READ_ONCE)
......
plugins/dvdread/Makefile
View file @ 003c2ab3
......@@ -32,14 +32,14 @@ $(BUILTIN_DVDREAD): BUILTIN_%.o: %.c
ifeq (1,$(NEED_LIBDVDCSS))
../dvdread.so: libdvdcss libdvdread $(PLUGIN_DVDREAD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
$(CC) -o $@ $(PLUGIN_DVDREAD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
../dvdread.a: libdvdcss libdvdread $(BUILTIN_DVDREAD)
ar r $@ $(BUILTIN_DVDREAD)
$(RANLIB) $@
else
../dvdread.so: libdvdread $(PLUGIN_DVDREAD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
$(CC) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN) $(LIB_DVDREAD_PLUGIN)
../dvdread.a: libdvdread $(BUILTIN_DVDREAD)
ar r $@ $(BUILTIN_DVDREAD)
......
plugins/esd/Makefile
View file @ 003c2ab3
......@@ -29,7 +29,7 @@ include ../../Makefile.modules
#
../esd.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_ESD)
../esd.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/fb/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../fb.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../fb.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/ggi/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../ggi.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GGI)
../ggi.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/glide/Makefile
View file @ 003c2ab3
......@@ -31,7 +31,7 @@ $(BUILTIN_GLIDE): BUILTIN_%.o: %.c
#
../glide.so: $(PLUGIN_GLIDE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE)
../glide.a: $(BUILTIN_GLIDE)
ar r $@ $^
......
plugins/gtk/Makefile
View file @ 003c2ab3
......@@ -55,7 +55,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
#
../gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
../gtk.a: $(BUILTIN_GTK)
ar r $@ $^
......@@ -63,7 +63,7 @@ $(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
../gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
../gnome.a: $(BUILTIN_GNOME)
ar r $@ $^
......
plugins/gtk/gnome_interface.c
View file @ 003c2ab3
......@@ -1077,7 +1077,7 @@ create_intf_about (void)
};
GtkWidget *intf_about;
intf_about = gnome_about_new ("VideoLAN Client", VERSION,
intf_about = gnome_about_new ("VideoLAN Client", VLC_VERSION,
_("(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"),
authors,
_("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."),
......
plugins/gtk/intf_gnome.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* intf_gnome.c: Gnome interface
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: intf_gnome.c,v 1.7 2001/12/07 18:33:07 sam Exp $
* $Id: intf_gnome.c,v 1.8 2001/12/10 04:53:10 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -192,7 +192,7 @@ static void intf_Run( intf_thread_t *p_intf )
int i_timeout;
/* Initialize Gnome */
gnome_init( p_main->psz_arg0, VERSION, i_args, p_args );
gnome_init( p_main->psz_arg0, VLC_VERSION, i_args, p_args );
/* Create some useful widgets that will certainly be used */
p_intf->p_sys->p_window = create_intf_window( );
......
plugins/idct/Makefile
View file @ 003c2ab3
......@@ -57,35 +57,35 @@ $(BUILTIN_IDCTALTIVEC): BUILTIN_IDCTALTIVEC_%.o: %.c
#
../idct.so: $(PLUGIN_IDCT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../idct.a: $(BUILTIN_IDCT)
ar r $@ $^
$(RANLIB) $@
../idctclassic.so: $(PLUGIN_IDCTCLASSIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../idctclassic.a: $(BUILTIN_IDCTCLASSIC)
ar r $@ $^
$(RANLIB) $@
../idctmmx.so: $(PLUGIN_IDCTMMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../idctmmx.a: $(BUILTIN_IDCTMMX)
ar r $@ $^
$(RANLIB) $@
../idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
ar r $@ $^
$(RANLIB) $@
../idctaltivec.so: $(PLUGIN_IDCTALTIVEC)
$(CC) $(PCFLAGS) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS)
$(CC) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS)
../idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
ar r $@ $^
......
plugins/imdct/Makefile
View file @ 003c2ab3
......@@ -45,21 +45,21 @@ $(BUILTIN_IMDCT3DN): BUILTIN_IMDCT3DN_%.o: %.c
#
../imdct.so: $(PLUGIN_IMDCT) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../imdct.a: $(BUILTIN_IMDCT)
ar r $@ $^
$(RANLIB) $@
../imdctsse.so: $(PLUGIN_IMDCTSSE) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../imdctsse.a: $(BUILTIN_IMDCTSSE)
ar r $@ $^
$(RANLIB) $@
../imdct3dn.so: $(PLUGIN_IMDCT3DN) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../imdct3dn.a: $(BUILTIN_IMDCT3DN)
ar r $@ $^
......
plugins/kde/Makefile
View file @ 003c2ab3
......@@ -63,7 +63,7 @@ $(BUILTIN_KDE_MOC): BUILTIN_%.o: %.cpp
#
../kde.so: $(PLUGIN_KDE) $(PLUGIN_KDE_MOC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_KDE)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_KDE)
../kde.a: $(BUILTIN_KDE) $(BUILTIN_KDE_MOC)
ar r $@ $^
......
plugins/kde/kdeinterface.cpp
View file @ 003c2ab3
......@@ -45,7 +45,7 @@ void _M( intf_getfunctions )( function_list_t * p_function_list )
KDEInterface::KDEInterface(intf_thread_t *p_intf)
{
fAboutData = new KAboutData("VideoLAN Client", I18N_NOOP("Kvlc"),
VERSION,
VLC_VERSION,
"This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.", KAboutData::License_GPL,
"(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team", 0, 0, "dae@chez.com");
......
plugins/lpcm_adec/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../lpcm_adec.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../lpcm_adec.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/lpcm_adec/lpcm_adec.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* lpcm_decoder_thread.c: lpcm decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: lpcm_adec.c,v 1.4 2001/12/09 17:01:36 sam Exp $
* $Id: lpcm_adec.c,v 1.5 2001/12/10 04:53:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org>
......@@ -45,14 +45,14 @@
#include "audio_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "lpcm_adec.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
plugins/macosx/Makefile
View file @ 003c2ab3
......@@ -31,7 +31,7 @@ $(BUILTIN_MACOSX): BUILTIN_%.o: %.c
#
../macosx.so: $(PLUGIN_MACOSX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) -lobjc
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) -lobjc
../macosx.a: $(BUILTIN_MACOSX)
ar r $@ $^
......
plugins/mad/Makefile
View file @ 003c2ab3
......@@ -29,7 +29,7 @@ $(BUILTIN_MAD): BUILTIN_%.o: %.c
#
../mad.so: $(PLUGIN_MAD)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MAD)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_MAD)
../mad.a: $(BUILTIN_MAD)
ar r $@ $^
......
plugins/memcpy/Makefile
View file @ 003c2ab3
......@@ -32,28 +32,28 @@ include ../../Makefile.modules
#
../memcpy.so: $(PLUGIN_MEMCPY)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../memcpy.a: $(BUILTIN_MEMCPY)
ar r $@ $^
$(RANLIB) $@
../memcpymmx.so: $(PLUGIN_MEMCPYMMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../memcpymmx.a: $(BUILTIN_MEMCPYMMX)
ar r $@ $^
$(RANLIB) $@
../memcpymmxext.so: $(PLUGIN_MEMCPYMMXEXT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../memcpymmxext.a: $(BUILTIN_MEMCPYMMXEXT)
ar r $@ $^
$(RANLIB) $@
../memcpy3dn.so: $(PLUGIN_MEMCPY3DN)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../memcpy3dn.a: $(BUILTIN_MEMCPY3DN)
ar r $@ $^
......
plugins/mga/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../mga.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../mga.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/motion/Makefile
View file @ 003c2ab3
......@@ -57,42 +57,42 @@ $(BUILTIN_MOTIONALTIVEC): BUILTIN_MOTIONALTIVEC_%.o: %.c
#
../motion.so: $(PLUGIN_MOTION)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../motion.a: $(BUILTIN_MOTION)
ar r $@ $^
$(RANLIB) $@
../motionclassic.so: $(PLUGIN_MOTIONCLASSIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../motionclassic.a: $(BUILTIN_MOTIONCLASSIC)
ar r $@ $^
$(RANLIB) $@
../motionmmx.so: $(PLUGIN_MOTIONMMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../motionmmx.a: $(BUILTIN_MOTIONMMX)
ar r $@ $^
$(RANLIB) $@
../motionmmxext.so: $(PLUGIN_MOTIONMMXEXT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
ar r $@ $^
$(RANLIB) $@
../motion3dnow.so: $(PLUGIN_MOTION3DNOW)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../motion3dnow.a: $(BUILTIN_MOTION3DNOW)
ar r $@ $^
$(RANLIB) $@
../motionaltivec.so: $(PLUGIN_MOTIONALTIVEC)
$(CC) $(PCFLAGS) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS)
$(CC) -o $@ $^ $(LIB_ALTIVEC) $(PLCFLAGS)
../motionaltivec.a: $(BUILTIN_MOTIONALTIVEC)
ar r $@ $^
......
plugins/mpeg_adec/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../mpeg_adec.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../mpeg_adec.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/mpeg_adec/adec_layer1.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* adec_layer1.c: MPEG Layer I audio decoder
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: adec_layer1.c,v 1.3 2001/12/09 17:01:36 sam Exp $
* $Id: adec_layer1.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -32,7 +32,6 @@
#include "threads.h"
#include "mtime.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -40,6 +39,8 @@
#include "mpeg_adec.h"
#include "adec_math.h" /* DCT32(), PCM() */
#include "modules_export.h"
/**** wkn ****/
static float adec_scalefactor_table[64] =
......
plugins/mpeg_adec/adec_layer2.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* adec_layer2.c: MPEG Layer II audio decoder
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: adec_layer2.c,v 1.3 2001/12/09 17:01:36 sam Exp $
* $Id: adec_layer2.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -31,7 +31,6 @@
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -39,6 +38,8 @@
#include "mpeg_adec.h"
#include "adec_math.h" /* DCT32(), PCM() */
#include "modules_export.h"
/**** wkn ****/
static float adec_scalefactor_table[64] =
......
plugins/mpeg_adec/mpeg_adec.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* mpeg_adec.c: MPEG audio decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: mpeg_adec.c,v 1.6 2001/12/09 17:01:36 sam Exp $
* $Id: mpeg_adec.c,v 1.7 2001/12/10 04:53:11 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -42,15 +42,15 @@
#include "audio_output.h" /* aout_fifo_t (for audio_decoder.h) */
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "mpeg_adec_generic.h"
#include "mpeg_adec.h"
#include "modules.h"
#include "modules_export.h"
#define ADEC_FRAME_SIZE (2*1152)
/*****************************************************************************
......
plugins/mpeg_adec/mpeg_adec_generic.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* adec_generic.c: MPEG audio decoder
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: mpeg_adec_generic.c,v 1.3 2001/12/09 17:01:36 sam Exp $
* $Id: mpeg_adec_generic.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -31,9 +31,6 @@
#include "threads.h"
#include "mtime.h"
#include "modules.h"
#include "modules_export.h" /* Used for exporting vlc symbols to plugins */
#include "input_ext-dec.h"
#include "stream_control.h"
......@@ -43,6 +40,9 @@
#include "adec_layer1.h"
#include "adec_layer2.h"
#include "modules.h"
#include "modules_export.h" /* Used for exporting vlc symbols to plugins */
int adec_Init( adec_thread_t * p_adec )
{
p_adec->bank_0.actual = p_adec->bank_0.v1;
......
plugins/mpeg_system/Makefile
View file @ 003c2ab3
......@@ -29,21 +29,21 @@ include ../../Makefile.modules
#
../mpeg_es.so: $(PLUGIN_ES)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../mpeg_es.a: $(BUILTIN_ES)
ar r $@ $^
$(RANLIB) $@
../mpeg_ps.so: $(PLUGIN_PS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../mpeg_ps.a: $(BUILTIN_PS)
ar r $@ $^
$(RANLIB) $@
../mpeg_ts.so: $(PLUGIN_TS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_TS)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_TS)
../mpeg_ts.a: $(BUILTIN_TS)
ar r $@ $^
......
plugins/mpeg_system/input_es.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* input_es.c: Elementary Stream demux and packet management
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: input_es.c,v 1.1 2001/12/09 17:01:36 sam Exp $
* $Id: input_es.c,v 1.2 2001/12/10 04:53:11 sam Exp $
*
* Author: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -58,9 +58,6 @@
# include "input_iovec.h"
#endif
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......@@ -70,6 +67,9 @@
#include "debug.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
plugins/mpeg_system/input_ps.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* input_ps.c: PS demux and packet management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_ps.c,v 1.1 2001/12/09 17:01:36 sam Exp $
* $Id: input_ps.c,v 1.2 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -56,9 +56,6 @@
#include "mtime.h"
#include "tests.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......@@ -68,6 +65,9 @@
#include "debug.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* fseeko: fseeko replacement for BSDI.
*****************************************************************************/
......
plugins/mpeg_system/input_ts.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* input_ts.c: TS demux and netlist management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_ts.c,v 1.1 2001/12/09 17:01:36 sam Exp $
* $Id: input_ts.c,v 1.2 2001/12/10 04:53:11 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org>
*
......@@ -72,9 +72,6 @@
# include "input_iovec.h"
#endif
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
......@@ -82,6 +79,9 @@
#include "input_ts.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
plugins/mpeg_vdec/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../mpeg_vdec.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../mpeg_vdec.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/mpeg_vdec/video_decoder.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* video_decoder.c : video decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video_decoder.c,v 1.3 2001/12/09 17:01:36 sam Exp $
* $Id: video_decoder.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@zoy.org>
......@@ -43,7 +43,6 @@
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -52,6 +51,8 @@
#include "vpar_pool.h"
#include "video_parser.h"
#include "modules_export.h"
/*
* Local prototypes
*/
......
plugins/mpeg_vdec/video_parser.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video_parser.c,v 1.6 2001/12/07 18:33:08 sam Exp $
* $Id: video_parser.c,v 1.7 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -47,12 +47,10 @@
#include "intf_msg.h"
#include "threads.h"
#include "mtime.h"
#include "modules.h"
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -60,6 +58,8 @@
#include "vpar_pool.h"
#include "video_parser.h"
#include "modules.h"
#include "modules_export.h"
/*
* Local prototypes
......
plugins/mpeg_vdec/vpar_blocks.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* vpar_blocks.c : blocks parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vpar_blocks.c,v 1.3 2001/12/09 17:01:37 sam Exp $
* $Id: vpar_blocks.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
* Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
......@@ -38,17 +38,17 @@
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "vdec_ext-plugins.h"
#include "vpar_pool.h"
#include "video_parser.h"
#include "vpar_blocks.h"
#include "modules_export.h"
/*
* Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing
* task is done. This file is divided in several parts :
......
plugins/mpeg_vdec/vpar_headers.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vpar_headers.c,v 1.3 2001/12/09 17:01:37 sam Exp $
* $Id: vpar_headers.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr>
......@@ -38,16 +38,16 @@
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "vdec_ext-plugins.h"
#include "vpar_pool.h"
#include "video_parser.h"
#include "video_decoder.h"
#include "modules_export.h"
/*
* Local prototypes
*/
......
plugins/mpeg_vdec/vpar_pool.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* vpar_pool.c : management of the pool of decoder threads
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vpar_pool.c,v 1.3 2001/12/09 17:01:37 sam Exp $
* $Id: vpar_pool.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -37,16 +37,16 @@
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "vdec_ext-plugins.h"
#include "vpar_pool.h"
#include "video_parser.h"
#include "video_decoder.h"
#include "modules_export.h"
/*
* Local prototypes
*/
......
plugins/mpeg_vdec/vpar_synchro.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vpar_synchro.c,v 1.3 2001/12/07 18:33:08 sam Exp $
* $Id: vpar_synchro.c,v 1.4 2001/12/10 04:53:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -106,7 +106,6 @@
#include "video.h"
#include "video_output.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
......@@ -114,6 +113,7 @@
#include "vpar_pool.h"
#include "video_parser.h"
#include "modules_export.h"
/*
* Local prototypes
......
plugins/qnx/Makefile
View file @ 003c2ab3
......@@ -23,7 +23,7 @@ include ../../Makefile.modules
#
../qnx.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QNX)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_QNX)
../qnx.a: $(BUILTIN_C)
ar r $@ $^
plugins/qt/Makefile
View file @ 003c2ab3
......@@ -35,7 +35,7 @@ $(BUILTIN_QT:%.o=%.moc): BUILTIN_%.moc: %.cpp
#
../qt.so: $(PLUGIN_QT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
../qt.a: $(BUILTIN_QT)
ar r $@ $^
......
plugins/sdl/Makefile
View file @ 003c2ab3
......@@ -31,7 +31,7 @@ $(BUILTIN_SDL): BUILTIN_%.o: %.c
#
../sdl.so: $(PLUGIN_SDL)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
../sdl.a: $(BUILTIN_SDL)
ar r $@ $^
......
plugins/spudec/Makefile
View file @ 003c2ab3
......@@ -21,7 +21,7 @@ include ../../Makefile.modules
#
../spudec.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
$(CC) -o $@ $^ $(PLCFLAGS)
../spudec.a: $(BUILTIN_C)
ar r $@ $^
......
plugins/spudec/spu_decoder.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* spu_decoder.c : spu decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spu_decoder.c,v 1.1 2001/12/09 17:01:37 sam Exp $
* $Id: spu_decoder.c,v 1.2 2001/12/10 04:53:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -48,13 +48,14 @@
#include "video.h"
#include "video_output.h"
#include "modules.h"
#include "modules_export.h"
#include "stream_control.h"
#include "input_ext-dec.h"
#include "spu_decoder.h"
#include "modules.h"
#include "modules_export.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......
plugins/text/Makefile
View file @ 003c2ab3
......@@ -34,7 +34,7 @@ include ../../Makefile.modules
$(RANLIB) $@
../rc.so: $(PLUGIN_RC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_RC)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_RC)
../rc.a: $(BUILTIN_RC)
ar r $@ $^
......
plugins/vcd/Makefile
View file @ 003c2ab3
......@@ -31,7 +31,7 @@ $(BUILTIN_VCD): BUILTIN_%.o: %.c
#
../vcd.so: $(PLUGIN_VCD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_VCD) $(PLCFLAGS)
$(CC) -o $@ $(PLUGIN_VCD) $(PLCFLAGS)
../vcd.a: $(BUILTIN_VCD)
ar r $@ $(BUILTIN_VCD)
......
plugins/x11/Makefile
View file @ 003c2ab3
......@@ -9,15 +9,15 @@
PLUGIN_X11 = x11.o vout_x11.o
PLUGIN_XVIDEO = xvideo.o vout_xvideo.o
PLUGIN_XCOMMON = vout_common.o
PLUGIN_COMMON = vout_common.o
BUILTIN_X11 = $(PLUGIN_X11:%.o=BUILTIN_X11_%.o) \
$(PLUGIN_XCOMMON:%.o=BUILTIN_X11_%.o)
$(PLUGIN_COMMON:%.o=BUILTIN_X11_%.o)
BUILTIN_XVIDEO = $(PLUGIN_XVIDEO:%.o=BUILTIN_XVIDEO_%.o) \
$(PLUGIN_XCOMMON:%.o=BUILTIN_XVIDEO_%.o)
$(PLUGIN_COMMON:%.o=BUILTIN_XVIDEO_%.o)
PLUGIN_C = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_XCOMMON)
ALL_OBJ = $(PLUGIN_C) $(BUILTIN_X11) $(BUILTIN_XVIDEO)
ALL_OBJ = $(PLUGIN_X11) $(PLUGIN_XVIDEO) $(PLUGIN_COMMON) \
$(PLUGIN_COMMON:%.o=%_xvideo.o) $(BUILTIN_X11) $(BUILTIN_XVIDEO)
#
# Virtual targets
......@@ -25,10 +25,24 @@ ALL_OBJ = $(PLUGIN_C) $(BUILTIN_X11) $(BUILTIN_XVIDEO)
include ../../Makefile.modules
# X11
$(PLUGIN_X11) $(PLUGIN_COMMON): %.o: .dep/%.d
$(PLUGIN_X11) $(PLUGIN_COMMON): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_X11) -DPLUGIN -DMODULE_NAME=x11 -c -o $@ $<
$(BUILTIN_X11): BUILTIN_X11_%.o: .dep/%.d
$(BUILTIN_X11): BUILTIN_X11_%.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_X11) -DBUILTIN -DMODULE_NAME=x11 -c -o $@ $<
# XVideo
$(PLUGIN_XVIDEO): %.o: .dep/%.d
$(PLUGIN_XVIDEO): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
$(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: .dep/%.d
$(PLUGIN_COMMON:%.o=%_xvideo.o): %_xvideo.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_XVIDEO) -DPLUGIN -DMODULE_NAME=xvideo -c -o $@ $<
$(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: .dep/%.d
$(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_XVIDEO) -DBUILTIN -DMODULE_NAME=xvideo -c -o $@ $<
......@@ -37,15 +51,15 @@ $(BUILTIN_XVIDEO): BUILTIN_XVIDEO_%.o: %.c
# Real targets
#
../x11.so: $(PLUGIN_X11)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11)
../x11.so: $(PLUGIN_X11) $(PLUGIN_COMMON)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_X11)
../x11.a: $(BUILTIN_X11)
ar r $@ $^
$(RANLIB) $@
../xvideo.so: $(PLUGIN_XVIDEO)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO)
../xvideo.so: $(PLUGIN_XVIDEO) $(PLUGIN_COMMON:%.o=%_xvideo.o)
$(CC) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO)
../xvideo.a: $(BUILTIN_XVIDEO)
ar r $@ $^
......
po/.cvsignore 0 → 100644
View file @ 003c2ab3
Makefile
Makefile.in
POTFILES
*.mo
po/Makefile.in.in 0 → 100644
View file @ 003c2ab3
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
# This file file be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
subdir = po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
CC = @CC@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
DEFS = @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
INCLUDES = -I.. -I$(top_srcdir)/intl
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
$(POFILES) $(GMOFILES)
POTFILES = \
CATALOGS = @CATALOGS@
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo
.c.o:
$(COMPILE) $<
.po.pox:
$(MAKE) $(PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
.po.mo:
$(MSGFMT) -o $@ $<
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
all: all-@USE_NLS@
all-yes: $(CATALOGS)
all-no:
# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
install-data-no: all
install-data-yes: all
$(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
echo "installing $(srcdir)/$$cat as" \
"$(DESTDIR)$$dir/$(PACKAGE).mo"; \
fi; \
done
# Define this as empty until I found a useful application.
installcheck:
uninstall:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
done
if test "$(PACKAGE)" = "gettext"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
check: all
dvi info tags TAGS ID:
mostlyclean:
rm -f core core.* *.pox $(PACKAGE).po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
rm -f $(GMOFILES)
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
$(MAKE) update-po
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
for file in $$dists; do \
cp -p $(srcdir)/$$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(PACKAGE).pot
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
cd $(srcdir); \
catalogs='$(GMOFILES)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\.gmo$$//'`; \
echo "$$lang:"; \
if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
mv -f $$lang.new.po $$lang.po; \
else \
echo "msgmerge for $$cat failed!"; \
rm -f $$lang.new.po; \
fi; \
done
$(MAKE) update-gmo
update-gmo: Makefile $(GMOFILES)
@:
POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \
posrcprefix='$(top_srcdir)/'; \
else \
posrcprefix="../"; \
fi; \
rm -f $@-t $@ \
&& (sed -e '/^#/d' -e '/^[ ]*$$/d' \
-e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
| sed -e '$$s/\\$$//') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )
Makefile: Makefile.in.in ../config.status POTFILES
cd .. \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
po/POTFILES.in 0 → 100644
View file @ 003c2ab3
plugins/gtk/gnome_interface.c
plugins/gtk/gtk_interface.c
po/de.po 0 → 100644
View file @ 003c2ab3
This diff is collapsed.
src/interface/interface.c
View file @ 003c2ab3
......@@ -4,7 +4,7 @@
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: interface.c,v 1.83 2001/12/09 17:01:37 sam Exp $
* $Id: interface.c,v 1.84 2001/12/10 04:53:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -47,8 +47,6 @@
#include "interface.h"
#include "intf_playlist.h"
#include "intf_channels.h"
#include "keystrokes.h"
#include "video.h"
#include "video_output.h"
......@@ -114,12 +112,6 @@ intf_thread_t* intf_Create( void )
/* Initialize mutexes */
vlc_mutex_init( &p_intf->change_lock );
/* Load channels - the pointer will be set to NULL on failure. The
* return value is ignored since the program can work without
* channels */
intf_LoadChannels( p_intf, main_GetPszVariable( INTF_CHANNELS_VAR,
INTF_CHANNELS_DEFAULT ));
intf_WarnMsg( 1, "intf: interface initialized");
return( p_intf );
}
......@@ -199,9 +191,6 @@ static void intf_Manage( intf_thread_t *p_intf )
*****************************************************************************/
void intf_Destroy( intf_thread_t *p_intf )
{
/* Unload channels */
intf_UnloadChannels( p_intf );
/* Destroy interfaces */
p_intf->pf_close( p_intf );
......
src/interface/intf_channels.c deleted 100644 → 0
View file @ 6dc23238
This diff is collapsed.
src/interface/intf_channels.h deleted 100644 → 0
View file @ 6dc23238
/*****************************************************************************
* intf_channels.h: Channel handling functions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: intf_channels.h,v 1.2 2001/03/21 13:42:34 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* intf_channel_t: channel description
*****************************************************************************
* A 'channel' is a descriptor of an input method. It is used to switch easily
* from source to source without having to specify the whole input thread
* configuration. The channels array, stored in the interface thread object, is
* loaded in intf_Create, and unloaded in intf_Destroy.
*****************************************************************************/
typedef struct intf_channel_s
{
/* Channel description */
int i_channel; /* channel number, -1 for end of array */
char * psz_description; /* channel description (owned) */
/* Input configuration */
int i_input_method; /* input method descriptor */
char * psz_input_source; /* source string (owned) */
int i_input_port; /* port */
int i_input_vlan_id; /* vlan id */
} intf_channel_t;
/*****************************************************************************
* Prototypes
*****************************************************************************/
int intf_LoadChannels ( struct intf_thread_s *, char * );
void intf_UnloadChannels ( struct intf_thread_s * );
int intf_SelectChannel ( struct intf_thread_s *, int );
src/interface/main.c
View file @ 003c2ab3
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.133 2001/12/09 17:01:37 sam Exp $
* $Id: main.c,v 1.134 2001/12/10 04:53:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -282,6 +282,25 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
p_aout_bank = &aout_bank;
p_vout_bank = &vout_bank;
#ifdef ENABLE_NLS
/*
* Support for getext
*/
if( ! setlocale(LC_MESSAGES, "") )
{
fprintf( stderr, "warning: unsupported locale.\n" );
}
if( ! bindtextdomain(PACKAGE, LOCALEDIR) )
{
fprintf( stderr, "warning: no domain %s in directory %s\n",
PACKAGE, LOCALEDIR );
}
textdomain( PACKAGE );
printf("main: %s\n", gettext("Net"));
#endif
/*
* Initialize threads system
*/
......@@ -386,18 +405,18 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
*/
p_main->p_memcpy_module = module_Need( MODULE_CAPABILITY_MEMCPY, NULL );
if( p_main->p_memcpy_module == NULL )
{
intf_ErrMsg( "intf error: no suitable memcpy module, "
"using libc default" );
p_main->fast_memcpy = memcpy;
}
else
if( p_main->p_memcpy_module != NULL )
{
#define f p_main->p_memcpy_module->p_functions->memcpy.functions.memcpy
p_main->fast_memcpy = f.fast_memcpy;
#undef f
}
else
{
intf_ErrMsg( "intf error: no suitable memcpy module, "
"using libc default" );
p_main->fast_memcpy = memcpy;
}
/*
* Initialize shared resources and libraries
......@@ -450,7 +469,10 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
/*
* Free memcpy module
*/
module_Unneed( p_main->p_memcpy_module );
if( p_main->p_memcpy_module != NULL )
{
module_Unneed( p_main->p_memcpy_module );
}
/*
* Free module, aout and vout banks
......
src/misc/modules.c
View file @ 003c2ab3
......@@ -2,7 +2,7 @@
* modules.c : Built-in and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.44 2001/12/07 18:33:08 sam Exp $
* $Id: modules.c,v 1.45 2001/12/10 04:53:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
......@@ -474,7 +474,7 @@ static int AllocatePluginModule( char * psz_filename )
}
/* Check that version numbers match */
if( strcmp( VERSION, p_module->psz_version ) )
if( strcmp( VLC_VERSION, p_module->psz_version ) )
{
free( p_module );
module_unload( handle );
......@@ -599,7 +599,7 @@ static int AllocateBuiltinModule( int ( *pf_init ) ( module_t * ),
}
/* Check that version numbers match */
if( strcmp( VERSION, p_module->psz_version ) )
if( strcmp( VLC_VERSION, p_module->psz_version ) )
{
free( p_module );
return( -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