Commit bf9b62a4 authored by Sam Hocevar's avatar Sam Hocevar

* ALL: changed "struct foo_s" into "struct foo_t" to make greppers happy.

  * ./src/libvlc.c, ./include/vlc/vlc.h: created reentrant versions of the
    libvlc API.
  * ./src/vlc.c: vlc uses the non-reentrant libvlc functions.
  * ./mozilla/vlcplugin.c: the mozilla plugin uses the reentrant functions.
  * ./debian/*: created packages for libvlc0-dev.
parent d033d98b
......@@ -5,6 +5,7 @@ conftest
conftest.*
.dep
gmon.out
vlc-config
vlc-debug.*
vlc-log.*
config.log
......
......@@ -313,9 +313,9 @@ distclean: clean
#
# Install/uninstall rules
#
install: vlc-install plugins-install po-install mozilla-install
install: vlc-install plugins-install libvlc-install po-install mozilla-install
uninstall: vlc-uninstall plugins-uninstall po-uninstall mozilla-uninstall
uninstall: vlc-uninstall plugins-uninstall libvlc-install po-uninstall mozilla-uninstall
vlc-install:
mkdir -p $(DESTDIR)$(bindir)
......@@ -340,12 +340,25 @@ endif
plugins-install:
mkdir -p $(DESTDIR)$(libdir)/vlc
ifneq (,$(PLUGINS))
$(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/vlc
$(INSTALL) $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/vlc
endif
plugins-uninstall:
rm -f $(DESTDIR)$(libdir)/vlc/*.so
libvlc-install:
mkdir -p $(DESTDIR)$(bindir)
$(INSTALL) vlc-config $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(includedir)/vlc
$(INSTALL) -m 644 include/vlc/*.h $(DESTDIR)$(includedir)/vlc
mkdir -p $(DESTDIR)$(libdir)
$(INSTALL) -m 644 lib/libvlc.a $(DESTDIR)$(libdir)
libvlc-uninstall:
rm -f $(DESTDIR)$(bindir)/vlc-config
rm -Rf $(DESTDIR)$(includedir)/vlc
rm -f $(DESTDIR)$(libdir)/libvlc.a
mozilla-install:
ifeq ($(MOZILLA),1)
-cd mozilla && $(MAKE) install
......@@ -585,7 +598,7 @@ endif
# Main application target
#
vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
......@@ -598,9 +611,15 @@ endif
#
# Main library target
#
lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ) $(BUILTIN_OBJ)
rm -f $@
ar rc $@ $(LIBVLC_OBJ)
ifneq (,$(BUILTINS))
rm -Rf lib/tmp && mkdir -p lib/tmp
cd lib/tmp && for i in $(BUILTINS) ; do ar x ../../plugins/$$i.a ; done
ar rcs $@ lib/tmp/*
rm -Rf lib/tmp
endif
$(RANLIB) $@
#lib/libvlc.so: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
......
#! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client
## $Id: bootstrap.sh,v 1.6 2002/07/11 19:28:13 sam Exp $
## $Id: bootstrap.sh,v 1.7 2002/07/20 18:01:41 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -32,7 +32,7 @@ file=include/vlc_symbols.h
rm -f $file && touch $file
echo '/* DO NOT EDIT THIS FILE ! It was generated by bootstrap.sh */' >> $file
echo '' >> $file
echo 'struct module_symbols_s' >> $file
echo 'struct module_symbols_t' >> $file
echo '{' >> $file
cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' | sort >> $file
......
......@@ -8891,6 +8891,10 @@ CPPFLAGS="${save_CPPFLAGS}"
CFLAGS="${save_CFLAGS}"
LDFLAGS="${save_LDFLAGS}"
libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} `eval echo '$'{${i}_LDFLAGS}`" ; done
......@@ -9093,7 +9097,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile.config Makefile.opts po/Makefile.in include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "Makefile.config Makefile.opts po/Makefile.in vlc-config include/defs.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
......@@ -9183,6 +9187,7 @@ s%@GNOME_CONFIG@%$GNOME_CONFIG%g
s%@MOZILLA_CONFIG@%$MOZILLA_CONFIG%g
s%@DATA_PATH@%$DATA_PATH%g
s%@PLUGIN_PATH@%$PLUGIN_PATH%g
s%@libvlc_LDFLAGS@%$libvlc_LDFLAGS%g
s%@SYS@%$SYS%g
s%@ARCH@%$ARCH%g
s%@PLUGINS@%$PLUGINS%g
......@@ -9317,7 +9322,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile.config Makefile.opts po/Makefile.in"}
CONFIG_FILES=\${CONFIG_FILES-"Makefile.config Makefile.opts po/Makefile.in vlc-config"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
......@@ -9525,6 +9530,7 @@ chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
chmod a+x vlc-config
echo "
vlc configuration
......
......@@ -1726,6 +1726,13 @@ CPPFLAGS="${save_CPPFLAGS}"
CFLAGS="${save_CFLAGS}"
LDFLAGS="${save_LDFLAGS}"
dnl
dnl Create the vlc-config script
dnl
libvlc_LDFLAGS="${vlc_LDFLAGS} ${builtins_LDFLAGS}"
for i in ${BUILTINS} ; do libvlc_LDFLAGS="${libvlc_LDFLAGS} `eval echo '$'{${i}_LDFLAGS}`" ; done
AC_SUBST(libvlc_LDFLAGS)
dnl
dnl Configuration is finished
dnl
......@@ -1830,7 +1837,8 @@ AC_SUBST(x11_LDFLAGS)
AC_SUBST(xvideo_LDFLAGS)
AC_SUBST(xosd_LDFLAGS)
AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in])
AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in vlc-config])
chmod a+x vlc-config
echo "
vlc configuration
......
......@@ -2,6 +2,7 @@ tmp
vlc
vlc-plugin-*
mozilla-plugin-vlc
libvlc0-dev
gvlc*
gnome-vlc*
qvlc*
......
......@@ -16,6 +16,15 @@ Description: a free MPEG, DVD and DivX player
This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
DVDs, or MPEG streams from a network source.
Package: libvlc0-dev
Architecture: any
Depends: ${shlibs:Depends}
Description: development files for the VideoLAN Client
VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution.
.
This package contains headers and a static library required to build plugins
for the Videolan Client, or standalone applications using VideoLAN Client.
Package: gnome-vlc
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
......
usr/bin
usr/lib
usr/include/vlc
usr/share/doc
......@@ -10,7 +10,7 @@ export DH_COMPAT=3
# Compilation options
export FFMPEG_VERSION=20020707
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-ffmpeg --with-ffmpeg-tree=ffmpeg-$(FFMPEG_VERSION)"
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-ffmpeg --with-ffmpeg-tree=ffmpeg-$(FFMPEG_VERSION) --enable-mp4"
# Remove --without-dvdcss here in non-totalitarian countries
export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"
......@@ -77,6 +77,12 @@ install: build
ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
# install development files
mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
mv debian/vlc/usr/include/vlc/* debian/libvlc0-dev/usr/include/vlc/
ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
# do the binary aliases
mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
ln -s vlc debian/gvlc/usr/share/doc/gvlc
......
......@@ -178,3 +178,8 @@
-- #videolan
%
The VCR is to the American film producer and the American public as
the Boston strangler is to the woman home alone.
-- Jack Valenti (president of the MPAA) on April 12, 1982
%
......@@ -2,7 +2,7 @@
* ac3_downmix.h : AC3 downmix types
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: ac3_downmix.h,v 1.4 2002/06/01 12:31:57 sam Exp $
* $Id: ac3_downmix.h,v 1.5 2002/07/20 18:01:41 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Renaud Dartus <reno@videolan.org>
......@@ -22,13 +22,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
struct dm_par_s {
struct dm_par_t
{
float unit;
float clev;
float slev;
};
struct downmix_s {
struct downmix_t
{
/* Module used and shortcuts */
module_t * p_module;
void (*pf_downmix_3f_2r_to_2ch)(float *, dm_par_t * dm_par);
......
......@@ -2,7 +2,7 @@
* ac3_imdct.h : AC3 IMDCT types
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: ac3_imdct.h,v 1.8 2002/06/01 12:31:57 sam Exp $
* $Id: ac3_imdct.h,v 1.9 2002/07/20 18:01:41 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Renaud Dartus <reno@videolan.org>
......@@ -22,14 +22,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
struct complex_s {
struct complex_t
{
float real;
float imag;
};
#define N 512
struct imdct_s
struct imdct_t
{
complex_t * buf;
void * buf_orig; /* pointer before memalign */
......
......@@ -2,7 +2,7 @@
* audio_output.h : audio output thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: audio_output.h,v 1.48 2002/06/01 18:04:48 sam Exp $
* $Id: audio_output.h,v 1.49 2002/07/20 18:01:41 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -29,7 +29,7 @@
* order to avoid rounding problems and heavy computations, as the function
* that handles this structure only uses additions.
*****************************************************************************/
typedef struct aout_increment_s
typedef struct aout_increment_t
{
/* The remainder is used to keep track of the fractional part of the
* index. */
......@@ -51,7 +51,7 @@ typedef struct aout_increment_s
/*****************************************************************************
* aout_fifo_t
*****************************************************************************/
struct aout_fifo_s
struct aout_fifo_t
{
/* See the fifo formats below */
int i_format;
......@@ -111,7 +111,7 @@ struct aout_fifo_s
/*****************************************************************************
* aout_thread_t : audio output thread descriptor
*****************************************************************************/
struct aout_thread_s
struct aout_thread_t
{
VLC_COMMON_MEMBERS
......
......@@ -4,7 +4,7 @@
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: configuration.h,v 1.15 2002/07/03 19:40:49 sam Exp $
* $Id: configuration.h,v 1.16 2002/07/20 18:01:41 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -46,7 +46,7 @@
#define CONFIG_ITEM 0x00F0
struct module_config_s
struct module_config_t
{
int i_type; /* Configuration type */
char *psz_name; /* Option name */
......
......@@ -2,7 +2,7 @@
* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input_ext-dec.h,v 1.61 2002/07/15 19:33:02 fenrir Exp $
* $Id: input_ext-dec.h,v 1.62 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr>
......@@ -51,7 +51,7 @@
*****************************************************************************
* Describe a data packet.
*****************************************************************************/
struct data_packet_s
struct data_packet_t
{
/* Used to chain the packets that carry data for a same PES or PSI */
data_packet_t * p_next;
......@@ -74,7 +74,7 @@ struct data_packet_s
* Describes an PES packet, with its properties, and pointers to the TS packets
* containing it.
*****************************************************************************/
struct pes_packet_s
struct pes_packet_t
{
/* Chained list to the next PES packet (depending on the context) */
pes_packet_t * p_next;
......@@ -104,7 +104,7 @@ struct pes_packet_s
*****************************************************************************
* This rotative FIFO contains PES packets that are to be decoded.
*****************************************************************************/
struct decoder_fifo_s
struct decoder_fifo_t
{
VLC_COMMON_MEMBERS
......@@ -135,7 +135,7 @@ struct decoder_fifo_s
*****************************************************************************/
typedef u32 WORD_TYPE;
typedef struct bit_fifo_s
typedef struct bit_fifo_t
{
/* This unsigned integer allows us to work at the bit level. This buffer
* can contain 32 bits, and the used space can be found on the MSb's side
......@@ -153,7 +153,7 @@ typedef struct bit_fifo_s
* This type, based on a PES stream, includes all the structures needed to
* handle the input stream like a bit stream.
*****************************************************************************/
struct bit_stream_s
struct bit_stream_t
{
/*
* Bit structures
......
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.69 2002/06/02 11:59:46 sam Exp $
* $Id: input_ext-intf.h,v 1.70 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -43,7 +43,7 @@
* Describes an elementary stream, and includes fields required to handle and
* demultiplex this elementary stream.
*****************************************************************************/
struct es_descriptor_s
struct es_descriptor_t
{
u16 i_id; /* stream ID for PS, PID for TS */
u8 i_stream_id; /* stream ID defined in the PES */
......@@ -98,7 +98,7 @@ struct es_descriptor_s
* Describes a program and list associated elementary streams. It is build by
* the PSI decoder upon the informations carried in program map sections
*****************************************************************************/
struct pgrm_descriptor_s
struct pgrm_descriptor_t
{
/* Program characteristics */
u16 i_number; /* program number */
......@@ -136,7 +136,7 @@ struct pgrm_descriptor_s
*****************************************************************************
* Attributes for current area (title for DVD)
*****************************************************************************/
struct input_area_s
struct input_area_t
{
/* selected area attributes */
int i_id; /* identificator for area */
......@@ -165,7 +165,7 @@ struct input_area_s
* Describes a stream and list its associated programs. Build upon
* the information carried in program association sections (for instance)
*****************************************************************************/
struct stream_descriptor_s
struct stream_descriptor_t
{
u16 i_stream_id; /* stream id */
vlc_bool_t b_changed; /* if stream has been changed,
......@@ -227,7 +227,7 @@ struct stream_descriptor_s
*****************************************************************************
* Describes the current position in the stream.
*****************************************************************************/
struct stream_position_s
struct stream_position_t
{
off_t i_tell; /* actual location in the area (in arbitrary units) */
off_t i_size; /* total size of the area (in arbitrary units) */
......@@ -243,7 +243,7 @@ struct stream_position_s
*****************************************************************************
* This structure includes all the local static variables of an input thread
*****************************************************************************/
struct input_thread_s
struct input_thread_t
{
VLC_COMMON_MEMBERS
......
......@@ -3,7 +3,7 @@
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: input_ext-plugins.h,v 1.30 2002/06/01 18:04:48 sam Exp $
* $Id: input_ext-plugins.h,v 1.31 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -174,7 +174,7 @@ typedef void( * psi_callback_t )(
* Describes a PSI section. Beware, it doesn't contain pointers to the TS
* packets that contain it as for a PES, but the data themselves
*****************************************************************************/
typedef struct psi_section_s
typedef struct psi_section_t
{
byte_t buffer[PSI_SECTION_SIZE];
......@@ -201,7 +201,7 @@ typedef struct psi_section_s
/*****************************************************************************
* es_ts_data_t: extension of es_descriptor_t
*****************************************************************************/
typedef struct es_ts_data_s
typedef struct es_ts_data_t
{
vlc_bool_t b_psi; /* Does the stream have to be handled by
* the PSI decoder ? */
......@@ -217,7 +217,7 @@ typedef struct es_ts_data_s
/*****************************************************************************
* pgrm_ts_data_t: extension of pgrm_descriptor_t
*****************************************************************************/
typedef struct pgrm_ts_data_s
typedef struct pgrm_ts_data_t
{
u16 i_pcr_pid; /* PCR ES, for TS streams */
int i_pmt_version;
......@@ -228,7 +228,7 @@ typedef struct pgrm_ts_data_s
/*****************************************************************************
* stream_ts_data_t: extension of stream_descriptor_t
*****************************************************************************/
typedef struct stream_ts_data_s
typedef struct stream_ts_data_t
{
int i_pat_version; /* Current version of the PAT */
/* libdvbpsi pmt decoder handle */
......@@ -238,7 +238,7 @@ typedef struct stream_ts_data_s
/*****************************************************************************
* stream_ps_data_t: extension of stream_descriptor_t
*****************************************************************************/
typedef struct stream_ps_data_s
typedef struct stream_ps_data_t
{
vlc_bool_t b_has_PSM; /* very rare, in fact */
......@@ -267,7 +267,7 @@ VLC_EXPORT( void, input_DemuxTS, ( input_thread_t *, data_packet_t *, void(*)
/*****************************************************************************
* input_socket_t: private access plug-in data
*****************************************************************************/
struct input_socket_s
struct input_socket_t
{
/* Unbuffered file descriptor */
int i_handle;
......
......@@ -4,7 +4,7 @@
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: interface.h,v 1.31 2002/07/17 21:54:37 stef Exp $
* $Id: interface.h,v 1.32 2002/07/20 18:01:41 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -29,7 +29,7 @@
* This structe describes all interface-specific data of the main (interface)
* thread.
*****************************************************************************/
struct intf_thread_s
struct intf_thread_t
{
VLC_COMMON_MEMBERS
......
......@@ -2,7 +2,7 @@
* iso_lang.h: function to decode language code (in dvd or a52 for instance).
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: iso_lang.h,v 1.6 2002/06/01 12:31:57 sam Exp $
* $Id: iso_lang.h,v 1.7 2002/07/20 18:01:41 sam Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
struct iso639_lang_s
struct iso639_lang_t
{
char * psz_eng_name; /* Description in English */
char * psz_native_name; /* Description in native language */
......
......@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: main.h,v 1.39 2002/06/27 19:05:17 sam Exp $
* $Id: main.h,v 1.40 2002/07/20 18:01:41 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -32,7 +32,7 @@
* it when you can access the members you need in an other way. In fact, it
* should only be used by interface thread.
*****************************************************************************/
struct vlc_s
struct vlc_t
{
VLC_COMMON_MEMBERS
......
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.56 2002/07/03 19:40:49 sam Exp $
* $Id: modules.h,v 1.57 2002/07/20 18:01:41 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -88,7 +88,7 @@ typedef void * module_handle_t;
*****************************************************************************
* This variable is accessed by any function using modules.
*****************************************************************************/
struct module_bank_s
struct module_bank_t
{
module_t * first; /* First module in the bank */
int i_count; /* Number of allocated modules */
......@@ -100,7 +100,7 @@ struct module_bank_s
/*****************************************************************************
* Module description structure
*****************************************************************************/
struct module_s
struct module_t
{
VLC_COMMON_MEMBERS
......@@ -166,7 +166,7 @@ struct module_s
/*****************************************************************************
* Module functions description structure
*****************************************************************************/
typedef struct function_list_s
typedef struct function_list_t
{
union
{
......@@ -298,7 +298,7 @@ typedef struct function_list_s
} function_list_t;
struct module_functions_s
struct module_functions_t
{
/* XXX: The order here has to be the same as above for the #defines */
function_list_t intf;
......
......@@ -2,7 +2,7 @@
* network.h: interface to communicate with network plug-ins
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: network.h,v 1.2 2002/06/01 12:31:57 sam Exp $
* $Id: network.h,v 1.3 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -25,7 +25,7 @@
* network_socket_t: structure passed to a network plug-in to define the
* kind of socket we want
*****************************************************************************/
struct network_socket_s
struct network_socket_t
{
unsigned int i_type;
......
......@@ -4,7 +4,7 @@
* of the reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: stream_control.h,v 1.8 2002/06/01 12:31:58 sam Exp $
* $Id: stream_control.h,v 1.9 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -33,7 +33,7 @@
*****************************************************************************
* Describe the state of a program stream.
*****************************************************************************/
struct stream_ctrl_s
struct stream_ctrl_t
{
vlc_mutex_t control_lock;
......
......@@ -2,7 +2,7 @@
* vdec_ext-plugins.h : structures from the video decoder exported to plug-ins
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: vdec_ext-plugins.h,v 1.13 2002/06/01 13:52:24 sam Exp $
* $Id: vdec_ext-plugins.h,v 1.14 2002/07/20 18:01:41 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -25,7 +25,7 @@
* macroblock_t : information on a macroblock passed to the video_decoder
* thread
*****************************************************************************/
typedef struct idct_inner_s
typedef struct idct_inner_t
{
/* Should be kept aligned ! */
dctelem_t * pi_block; /* block */
......@@ -37,7 +37,7 @@ typedef struct idct_inner_s
* non-NULL coeff */
} idct_inner_t;
typedef struct motion_inner_s
typedef struct motion_inner_t
{
vlc_bool_t b_average; /* 0 == copy */
int i_x_pred, i_y_pred; /* motion vectors */
......@@ -47,7 +47,7 @@ typedef struct motion_inner_s
vlc_bool_t b_second_half;
} motion_inner_t;
struct macroblock_s
struct macroblock_t
{
int i_mb_modes;
......
......@@ -4,7 +4,7 @@
* includes all common video types and constants.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.54 2002/07/15 19:33:02 fenrir Exp $
* $Id: video.h,v 1.55 2002/07/20 18:01:41 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -26,7 +26,7 @@
/*****************************************************************************
* plane_t: description of a planar graphic field
*****************************************************************************/
typedef struct plane_s
typedef struct plane_t
{
u8 *p_pixels; /* Start of the plane's data */
......@@ -54,7 +54,7 @@ typedef struct plane_s
* Picture type and flags should only be modified by the output thread. Note
* that an empty picture MUST have its flags set to 0.
*****************************************************************************/
struct picture_s
struct picture_t
{
/* Picture data - data can always be freely modified, but p_data may
* NEVER be modified. A direct buffer can be handled as the plugin
......@@ -93,7 +93,7 @@ struct picture_s
* picture_heap_t: video picture heap, either render (to store pictures used
* by the decoder) or output (to store pictures displayed by the vout plugin)
*****************************************************************************/
struct picture_heap_s
struct picture_heap_t
{
int i_pictures; /* current heap size */
......@@ -311,7 +311,7 @@ struct picture_heap_s
* Subtitle type and flags should only be modified by the output thread. Note
* that an empty subtitle MUST have its flags set to 0.
*****************************************************************************/
struct subpicture_s
struct subpicture_t
{
/* Type and flags - should NOT be modified except by the vout thread */
int i_type; /* type */
......
......@@ -5,7 +5,7 @@
* thread, and destroy a previously opened video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.80 2002/07/12 21:57:25 massiot Exp $
* $Id: video_output.h,v 1.81 2002/07/20 18:01:41 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -37,7 +37,7 @@
typedef void (vout_chroma_convert_t)( vout_thread_t *,
picture_t *, picture_t * );
typedef struct vout_chroma_s
typedef struct vout_chroma_t
{
/* conversion functions */
vout_chroma_convert_t *pf_convert;
......@@ -55,7 +55,7 @@ typedef struct vout_chroma_s
/*****************************************************************************
* vout_fifo_t
*****************************************************************************/
typedef struct vout_fifo_s
typedef struct vout_fifo_t
{
/* See the fifo types below */
int i_type;
......@@ -78,7 +78,7 @@ typedef struct vout_fifo_s
* is represented by a video output thread, and described using the following
* structure.
*****************************************************************************/
struct vout_thread_s
struct vout_thread_t
{
VLC_COMMON_MEMBERS
......