conftest.*
.dep
gmon.out
+vlc-config
vlc-debug.*
vlc-log.*
config.log
#
# 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)
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
# 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 $@
#
# 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>
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
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
+
+
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
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
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
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
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
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
vlc
vlc-plugin-*
mozilla-plugin-vlc
+libvlc0-dev
gvlc*
gnome-vlc*
qvlc*
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}
--- /dev/null
+usr/bin
+usr/lib
+usr/include/vlc
+usr/share/doc
# 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"
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
-- #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
+%
* 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>
* 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);
* 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>
* 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 */
* 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>
* 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. */
/*****************************************************************************
* aout_fifo_t
*****************************************************************************/
-struct aout_fifo_s
+struct aout_fifo_t
{
/* See the fifo formats below */
int i_format;
/*****************************************************************************
* aout_thread_t : audio output thread descriptor
*****************************************************************************/
-struct aout_thread_s
+struct aout_thread_t
{
VLC_COMMON_MEMBERS
* 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>
*
#define CONFIG_ITEM 0x00F0
-struct module_config_s
+struct module_config_t
{
int i_type; /* Configuration type */
char *psz_name; /* Option name */
* 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>
*****************************************************************************
* 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;
* 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;
*****************************************************************************
* This rotative FIFO contains PES packets that are to be decoded.
*****************************************************************************/
-struct decoder_fifo_s
+struct decoder_fifo_t
{
VLC_COMMON_MEMBERS
*****************************************************************************/
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
* 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
* 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>
*
* 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 */
* 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 */
*****************************************************************************
* Attributes for current area (title for DVD)
*****************************************************************************/
-struct input_area_s
+struct input_area_t
{
/* selected area attributes */
int i_id; /* identificator for area */
* 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,
*****************************************************************************
* 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) */
*****************************************************************************
* This structure includes all the local static variables of an input thread
*****************************************************************************/
-struct input_thread_s
+struct input_thread_t
{
VLC_COMMON_MEMBERS
* 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>
*
* 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];
/*****************************************************************************
* 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 ? */
/*****************************************************************************
* 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;
/*****************************************************************************
* 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 */
/*****************************************************************************
* 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 */
/*****************************************************************************
* input_socket_t: private access plug-in data
*****************************************************************************/
-struct input_socket_s
+struct input_socket_t
{
/* Unbuffered file descriptor */
int i_handle;
* 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>
*
* This structe describes all interface-specific data of the main (interface)
* thread.
*****************************************************************************/
-struct intf_thread_s
+struct intf_thread_t
{
VLC_COMMON_MEMBERS
* 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: Stéphane Borel <stef@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* 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 */
* 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>
*
* 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
* 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>
*
*****************************************************************************
* 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 */
/*****************************************************************************
* Module description structure
*****************************************************************************/
-struct module_s
+struct module_t
{
VLC_COMMON_MEMBERS
/*****************************************************************************
* Module functions description structure
*****************************************************************************/
-typedef struct function_list_s
+typedef struct function_list_t
{
union
{
} 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;
* 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>
*
* 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;
* 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>
*
*****************************************************************************
* Describe the state of a program stream.
*****************************************************************************/
-struct stream_ctrl_s
+struct stream_ctrl_t
{
vlc_mutex_t control_lock;
* 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>
*
* 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 */
* 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 */
vlc_bool_t b_second_half;
} motion_inner_t;
-struct macroblock_s
+struct macroblock_t
{
int i_mb_modes;
* 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>
*
/*****************************************************************************
* 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 */
* 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
* 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 */
* 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 */
* 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>
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;
/*****************************************************************************
* vout_fifo_t
*****************************************************************************/
-typedef struct vout_fifo_s
+typedef struct vout_fifo_t
{
/* See the fifo types below */
int i_type;
* is represented by a video output thread, and described using the following
* structure.
*****************************************************************************/
-struct vout_thread_s
+struct vout_thread_t
{
VLC_COMMON_MEMBERS
* vlc.h: global header for vlc
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.5 2002/07/17 21:58:21 massiot Exp $
+ * $Id: vlc.h,v 1.6 2002/07/20 18:01:42 sam Exp $
*
* 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
/*****************************************************************************
* Our custom types
*****************************************************************************/
-#define VLC_DECLARE_STRUCT( name ) \
- struct name##_s; \
- typedef struct name##_s name##_t;
-VLC_DECLARE_STRUCT(vlc)
-VLC_DECLARE_STRUCT(vlc_object)
+#define VLC_DECLARE_STRUCT( name ) struct name; typedef struct name name;
+
+VLC_DECLARE_STRUCT(vlc_t)
+VLC_DECLARE_STRUCT(vlc_object_t)
typedef signed int vlc_error_t;
typedef int vlc_bool_t;
#endif
/*****************************************************************************
- * Exported libvlc base API
+ * Exported libvlc API
+ *****************************************************************************/
+vlc_status_t vlc_status ( void );
+
+vlc_error_t vlc_create ( void );
+vlc_error_t vlc_init ( int, char *[] );
+vlc_error_t vlc_run ( void );
+vlc_error_t vlc_stop ( void );
+vlc_error_t vlc_end ( void );
+vlc_error_t vlc_destroy ( void );
+
+vlc_error_t vlc_add_intf ( const char *, vlc_bool_t );
+vlc_error_t vlc_add_target ( const char *, int, int );
+
+/*****************************************************************************
+ * Exported libvlc reentrant API
*****************************************************************************/
-vlc_t * vlc_create ( void );
-vlc_error_t vlc_init ( vlc_t *, int, char *[] );
-vlc_error_t vlc_run ( vlc_t * );
-vlc_error_t vlc_stop ( vlc_t * );
-vlc_error_t vlc_end ( vlc_t * );
-vlc_error_t vlc_destroy ( vlc_t * );
+vlc_status_t vlc_status_r ( vlc_t * );
-vlc_error_t vlc_add_intf ( vlc_t *, const char *, vlc_bool_t );
-vlc_error_t vlc_add_target ( vlc_t *, const char *, int, int );
+vlc_t * vlc_create_r ( void );
+vlc_error_t vlc_init_r ( vlc_t *, int, char *[] );
+vlc_error_t vlc_run_r ( vlc_t * );
+vlc_error_t vlc_stop_r ( vlc_t * );
+vlc_error_t vlc_end_r ( vlc_t * );
+vlc_error_t vlc_destroy_r ( vlc_t * );
-vlc_status_t vlc_status ( vlc_t * );
+vlc_error_t vlc_add_intf_r ( vlc_t *, const char *, vlc_bool_t );
+vlc_error_t vlc_add_target_r ( vlc_t *, const char *, int, int );
# ifdef __cplusplus
}
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.9 2002/07/12 21:57:25 massiot Exp $
+ * $Id: vlc_common.h,v 1.10 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
*****************************************************************************/
/* Messages */
-VLC_DECLARE_STRUCT(msg_bank)
-VLC_DECLARE_STRUCT(msg_subscription)
+VLC_DECLARE_STRUCT(msg_bank_t)
+VLC_DECLARE_STRUCT(msg_subscription_t)
/* Playlist */
-VLC_DECLARE_STRUCT(playlist)
-VLC_DECLARE_STRUCT(playlist_item)
+VLC_DECLARE_STRUCT(playlist_t)
+VLC_DECLARE_STRUCT(playlist_item_t)
/* Modules */
-VLC_DECLARE_STRUCT(module_bank)
-VLC_DECLARE_STRUCT(module)
-VLC_DECLARE_STRUCT(module_config)
-VLC_DECLARE_STRUCT(module_symbols)
-VLC_DECLARE_STRUCT(module_functions)
+VLC_DECLARE_STRUCT(module_bank_t)
+VLC_DECLARE_STRUCT(module_t)
+VLC_DECLARE_STRUCT(module_config_t)
+VLC_DECLARE_STRUCT(module_symbols_t)
+VLC_DECLARE_STRUCT(module_functions_t)
/* Interface */
-VLC_DECLARE_STRUCT(intf_thread)
-VLC_DECLARE_STRUCT(intf_sys)
-VLC_DECLARE_STRUCT(intf_console)
-VLC_DECLARE_STRUCT(intf_msg)
-VLC_DECLARE_STRUCT(intf_channel)
+VLC_DECLARE_STRUCT(intf_thread_t)
+VLC_DECLARE_STRUCT(intf_sys_t)
+VLC_DECLARE_STRUCT(intf_console_t)
+VLC_DECLARE_STRUCT(intf_msg_t)
+VLC_DECLARE_STRUCT(intf_channel_t)
/* Input */
-VLC_DECLARE_STRUCT(input_thread)
-VLC_DECLARE_STRUCT(input_channel)
-VLC_DECLARE_STRUCT(input_cfg)
-VLC_DECLARE_STRUCT(input_area)
-VLC_DECLARE_STRUCT(input_buffers)
-VLC_DECLARE_STRUCT(input_socket)
+VLC_DECLARE_STRUCT(input_thread_t)
+VLC_DECLARE_STRUCT(input_channel_t)
+VLC_DECLARE_STRUCT(input_cfg_t)
+VLC_DECLARE_STRUCT(input_area_t)
+VLC_DECLARE_STRUCT(input_buffers_t)
+VLC_DECLARE_STRUCT(input_socket_t)
/* Audio */
-VLC_DECLARE_STRUCT(aout_thread)
-VLC_DECLARE_STRUCT(aout_sys)
-VLC_DECLARE_STRUCT(aout_fifo)
+VLC_DECLARE_STRUCT(aout_thread_t)
+VLC_DECLARE_STRUCT(aout_sys_t)
+VLC_DECLARE_STRUCT(aout_fifo_t)
/* Video */
-VLC_DECLARE_STRUCT(vout_thread)
-VLC_DECLARE_STRUCT(vout_font)
-VLC_DECLARE_STRUCT(vout_sys)
-VLC_DECLARE_STRUCT(chroma_sys)
-VLC_DECLARE_STRUCT(picture)
-VLC_DECLARE_STRUCT(picture_sys)
-VLC_DECLARE_STRUCT(picture_heap)
-VLC_DECLARE_STRUCT(subpicture)
-VLC_DECLARE_STRUCT(subpicture_sys)
+VLC_DECLARE_STRUCT(vout_thread_t)
+VLC_DECLARE_STRUCT(vout_font_t)
+VLC_DECLARE_STRUCT(vout_sys_t)
+VLC_DECLARE_STRUCT(chroma_sys_t)
+VLC_DECLARE_STRUCT(picture_t)
+VLC_DECLARE_STRUCT(picture_sys_t)
+VLC_DECLARE_STRUCT(picture_heap_t)
+VLC_DECLARE_STRUCT(subpicture_t)
+VLC_DECLARE_STRUCT(subpicture_sys_t)
/* Decoders */
-VLC_DECLARE_STRUCT(decoder_fifo)
+VLC_DECLARE_STRUCT(decoder_fifo_t)
/* Misc */
-VLC_DECLARE_STRUCT(macroblock)
-VLC_DECLARE_STRUCT(data_packet)
-VLC_DECLARE_STRUCT(data_buffer)
-VLC_DECLARE_STRUCT(downmix)
-VLC_DECLARE_STRUCT(imdct)
-VLC_DECLARE_STRUCT(complex)
-VLC_DECLARE_STRUCT(dm_par)
-VLC_DECLARE_STRUCT(es_descriptor)
-VLC_DECLARE_STRUCT(pgrm_descriptor)
-VLC_DECLARE_STRUCT(stream_descriptor)
-VLC_DECLARE_STRUCT(stream_position)
-VLC_DECLARE_STRUCT(stream_ctrl)
-VLC_DECLARE_STRUCT(pes_packet)
-VLC_DECLARE_STRUCT(bit_stream)
-VLC_DECLARE_STRUCT(network_socket)
-VLC_DECLARE_STRUCT(iso639_lang)
+VLC_DECLARE_STRUCT(macroblock_t)
+VLC_DECLARE_STRUCT(data_packet_t)
+VLC_DECLARE_STRUCT(data_buffer_t)
+VLC_DECLARE_STRUCT(downmix_t)
+VLC_DECLARE_STRUCT(imdct_t)
+VLC_DECLARE_STRUCT(complex_t)
+VLC_DECLARE_STRUCT(dm_par_t)
+VLC_DECLARE_STRUCT(es_descriptor_t)
+VLC_DECLARE_STRUCT(pgrm_descriptor_t)
+VLC_DECLARE_STRUCT(stream_descriptor_t)
+VLC_DECLARE_STRUCT(stream_position_t)
+VLC_DECLARE_STRUCT(stream_ctrl_t)
+VLC_DECLARE_STRUCT(pes_packet_t)
+VLC_DECLARE_STRUCT(bit_stream_t)
+VLC_DECLARE_STRUCT(network_socket_t)
+VLC_DECLARE_STRUCT(iso639_lang_t)
/*****************************************************************************
* Plug-in stuff
int be_sure_to_add_VLC_COMMON_MEMBERS_to_struct; \
/* The real vlc_object_t type. Yes, it's that simple :-) */
-struct vlc_object_s
+struct vlc_object_t
{
VLC_COMMON_MEMBERS
};
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_messages.h,v 1.3 2002/07/15 19:15:05 sam Exp $
+ * $Id: vlc_messages.h,v 1.4 2002/07/20 18:01:42 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*****************************************************************************
* Store all data requiered by messages interfaces.
*****************************************************************************/
-struct msg_bank_s
+struct msg_bank_t
{
/* Message queue lock */
vlc_mutex_t lock;
*****************************************************************************
* Used by interface plugins which subscribe to the message bank.
*****************************************************************************/
-struct msg_subscription_s
+struct msg_subscription_t
{
int i_start;
int* pi_stop;
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_playlist.h,v 1.2 2002/07/03 19:40:49 sam Exp $
+ * $Id: vlc_playlist.h,v 1.3 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* playlist_item_t: playlist item
*****************************************************************************/
-struct playlist_item_s
+struct playlist_item_t
{
char * psz_name;
int i_type; /* unused yet */
* the playlist, a change lock, a dynamic array of playlist items, and a
* current item which is an exact copy of one of the array members.
*****************************************************************************/
-struct playlist_s
+struct playlist_t
{
VLC_COMMON_MEMBERS
/* DO NOT EDIT THIS FILE ! It was generated by bootstrap.sh */
-struct module_symbols_s
+struct module_symbols_t
{
aout_fifo_t * (* __aout_CreateFifo_inner) ( vlc_object_t *, int, int, int, int, void * ) ;
char * (* config_GetHomeDir_inner) ( void ) ;
* vlcplugin.c: a VideoLAN Client plugin for Mozilla
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.c,v 1.2 2002/07/12 17:08:52 sam Exp $
+ * $Id: vlcplugin.c,v 1.3 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
//"--plugin-path", "/home/sam/videolan/vlc_MAIN/plugins",
"--vout", "xvideo,x11,dummy",
"--intf", "dummy",
- //"--noaudio",
+ "--noaudio",
//"-v"
};
This->window = 0;
}
- This->p_vlc = vlc_create();
+ This->p_vlc = vlc_create_r();
if( This->p_vlc == NULL )
{
return NPERR_GENERIC_ERROR;
}
- i_ret = vlc_init( This->p_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
+ i_ret = vlc_init_r( This->p_vlc, sizeof(ppsz_foo)/sizeof(char*), ppsz_foo );
if( i_ret )
{
- vlc_destroy( This->p_vlc );
+ vlc_destroy_r( This->p_vlc );
This->p_vlc = NULL;
return NPERR_GENERIC_ERROR;
}
- i_ret = vlc_run( This->p_vlc );
+ i_ret = vlc_run_r( This->p_vlc );
if( i_ret )
{
- vlc_end( This->p_vlc );
- vlc_destroy( This->p_vlc );
+ vlc_end_r( This->p_vlc );
+ vlc_destroy_r( This->p_vlc );
This->p_vlc = NULL;
return NPERR_GENERIC_ERROR;
}
if( This->p_vlc != NULL )
{
- vlc_stop( This->p_vlc );
- vlc_end( This->p_vlc );
- vlc_destroy( This->p_vlc );
+ vlc_stop_r( This->p_vlc );
+ vlc_end_r( This->p_vlc );
+ vlc_destroy_r( This->p_vlc );
This->p_vlc = NULL;
}
This->b_stream = 1;
if( This->psz_target )
{
- vlc_add_target( This->p_vlc, This->psz_target, PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( This->p_vlc, This->psz_target, PLAYLIST_APPEND, PLAYLIST_END );
/* We loop, dude */
- vlc_add_target( This->p_vlc, "vlc:loop", PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( This->p_vlc, "vlc:loop", PLAYLIST_APPEND, PLAYLIST_END );
}
}
#endif
if (instance != NULL)
{
This = (PluginInstance*) instance->pdata;
- vlc_add_target( This->p_vlc, fname, PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( This->p_vlc, fname, PLAYLIST_APPEND, PLAYLIST_END );
/* We loop, dude */
- vlc_add_target( This->p_vlc, "vlc:loop", PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( This->p_vlc, "vlc:loop", PLAYLIST_APPEND, PLAYLIST_END );
}
}
* vout_aa.c: Aa video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: aa.c,v 1.6 2002/06/02 09:03:53 sam Exp $
+ * $Id: aa.c,v 1.7 2002/07/20 18:01:42 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* This structure is part of the video output thread descriptor.
* It describes the aa specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
struct aa_context* aa_context;
aa_palette palette;
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: alsa.c,v 1.19 2002/07/17 06:40:49 sam Exp $
+ * $Id: alsa.c,v 1.20 2002/07/20 18:01:42 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
/*****************************************************************************
* Preamble
*****************************************************************************/
-typedef struct alsa_device_s
+typedef struct alsa_device_t
{
int i_num;
} alsa_device_t;
-typedef struct alsa_card_s
+typedef struct alsa_card_t
{
int i_num;
} alsa_card_t;
/* here we store plugin dependant informations */
-struct aout_sys_s
+struct aout_sys_t
{
snd_pcm_t * p_alsa_handle;
unsigned long buffer_time;
* This structure is part of the audio output thread descriptor.
* It describes some arts specific variables.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
arts_stream_t stream;
};
* aout_beos.cpp: BeOS audio output
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: aout_beos.cpp,v 1.24 2002/06/01 12:31:58 sam Exp $
+ * $Id: aout_beos.cpp,v 1.25 2002/07/20 18:01:42 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* This structure is part of the audio output thread descriptor.
* It describes some BeOS specific variables.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
BPushGameSound * p_sound;
gs_audio_format * p_format;
* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.41 2002/07/15 20:09:31 sam Exp $
+ * $Id: intf_beos.cpp,v 1.42 2002/07/20 18:01:42 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* intf_sys_t: description and status of FB interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
InterfaceWindow * p_window;
char i_key;
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.60 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout_beos.cpp,v 1.61 2002/07/20 18:01:42 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* This structure is part of the video output thread descriptor.
* It describes the BeOS specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
VideoWindow * p_window;
* i420_rgb.h : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: i420_rgb.h,v 1.6 2002/06/01 12:31:58 sam Exp $
+ * $Id: i420_rgb.h,v 1.7 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the chroma transformation descriptor, it
* describes the yuv2rgb specific properties.
*****************************************************************************/
-struct chroma_sys_s
+struct chroma_sys_t
{
u8 *p_buffer;
int *p_offset;
* aout_directx.c: Windows DirectX audio output method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: aout_directx.c,v 1.24 2002/06/02 09:03:54 sam Exp $
+ * $Id: aout_directx.c,v 1.25 2002/07/20 18:01:42 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
/*****************************************************************************
* notification_thread_t: DirectX event thread
*****************************************************************************/
-typedef struct notification_thread_s
+typedef struct notification_thread_t
{
VLC_COMMON_MEMBERS
* It describes the direct sound specific properties of an audio device.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
LPDIRECTSOUND p_dsobject; /* main Direct Sound object */
* vout_directx.h: Windows DirectX video output header file
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_directx.h,v 1.8 2002/06/01 16:45:34 sam Exp $
+ * $Id: vout_directx.h,v 1.9 2002/07/20 18:01:42 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
/*****************************************************************************
* event_thread_t: DirectX event thread
*****************************************************************************/
-typedef struct event_thread_s
+typedef struct event_thread_t
{
VLC_COMMON_MEMBERS
* This structure is part of the video output thread descriptor.
* It describes the DirectX specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
LPDIRECTDRAW2 p_ddobject; /* DirectDraw object */
LPDIRECTDRAWSURFACE3 p_display; /* Display device */
* This structure is part of the picture descriptor, it describes the
* DirectX specific properties of a direct buffer.
*****************************************************************************/
-struct picture_sys_s
+struct picture_sys_t
{
LPDIRECTDRAWSURFACE3 p_surface;
DDSURFACEDESC ddsd;
* dsp.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: dsp.c,v 1.17 2002/06/01 12:31:58 sam Exp $
+ * $Id: dsp.c,v 1.18 2002/07/20 18:01:42 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* This structure is part of the audio output thread descriptor.
* It describes the dsp specific properties of an audio device.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
audio_buf_info audio_buf;
* aout_dummy.c : dummy audio output plugin
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: aout_dummy.c,v 1.21 2002/06/01 12:31:58 sam Exp $
+ * $Id: aout_dummy.c,v 1.22 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the dummy specific properties of an output thread.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
/* Prevent malloc(0) */
int i_dummy;
* input_dummy.c: dummy input plugin, to manage "vlc:***" special options
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: input_dummy.c,v 1.19 2002/06/07 16:06:09 sam Exp $
+ * $Id: input_dummy.c,v 1.20 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* access_sys_t: private input data
*****************************************************************************/
-struct demux_sys_s
+struct demux_sys_t
{
/* The real command */
int i_command;
{
char * psz_name = p_input->psz_name;
int i_len = strlen( psz_name );
- struct demux_sys_s * p_method;
+ struct demux_sys_t * p_method;
int i_arg;
p_input->stream.b_seekable = 0;
- p_method = malloc( sizeof( struct demux_sys_s ) );
+ p_method = malloc( sizeof( struct demux_sys_t ) );
if( p_method == NULL )
{
msg_Err( p_input, "out of memory" );
*****************************************************************************/
static int DummyDemux( input_thread_t *p_input )
{
- struct demux_sys_s * p_method = p_input->p_demux_data;
+ struct demux_sys_t * p_method = p_input->p_demux_data;
playlist_t *p_playlist;
p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
* intf_dummy.c: dummy interface plugin
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: intf_dummy.c,v 1.20 2002/07/15 20:09:31 sam Exp $
+ * $Id: intf_dummy.c,v 1.21 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* intf_sys_t: description and status of FB interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
/* Prevent malloc(0) */
int i_dummy;
* vout_dummy.c: Dummy video output display method for testing purposes
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_dummy.c,v 1.24 2002/06/01 12:31:58 sam Exp $
+ * $Id: vout_dummy.c,v 1.25 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the dummy specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
/* Nothing needed here. Maybe stats ? */
* esd.c : EsounD module
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: esd.c,v 1.15 2002/06/01 12:31:59 sam Exp $
+ * $Id: esd.c,v 1.16 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the audio output thread descriptor.
* It describes some esd specific variables.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
esd_format_t esd_format;
int i_fd;
* fb.c : framebuffer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: fb.c,v 1.19 2002/06/01 12:31:59 sam Exp $
+ * $Id: fb.c,v 1.20 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the FB specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
/* System informations */
int i_tty; /* tty device handle */
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.15 2002/07/15 22:45:12 fenrir Exp $
+ * $Id: ffmpeg.c,v 1.16 2002/07/20 18:01:42 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
p_vdec->i_framesize);
__NextFrame( p_vdec );
-
+
if( i_status < 0 )
{
msg_Warn( p_vdec->p_fifo, "cannot decode one frame (%d bytes)",
p_vdec->i_framesize );
return;
}
- if( !b_gotpicture )
+ if( !b_gotpicture || avpicture.linesize[0] == 0 )
{
return;
}
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: clone.c,v 1.7 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: clone.c,v 1.8 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Clone specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
int i_clones;
vout_thread_t **pp_vout;
* crop.c : Crop video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: crop.c,v 1.3 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: crop.c,v 1.4 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Crop specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
vout_thread_t *p_vout;
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: deinterlace.c,v 1.17 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: deinterlace.c,v 1.18 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Deinterlace specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
int i_mode; /* Deinterlace mode */
vlc_bool_t b_double_rate; /* Shall we double the framerate? */
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: distort.c,v 1.16 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: distort.c,v 1.17 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Distort specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
int i_mode;
vout_thread_t *p_vout;
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: invert.c,v 1.14 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: invert.c,v 1.15 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Invert specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
vout_thread_t *p_vout;
};
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.15 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: transform.c,v 1.16 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Transform specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
int i_mode;
vlc_bool_t b_rotation;
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.23 2002/06/11 09:44:21 gbazin Exp $
+ * $Id: wall.c,v 1.24 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Wall specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
int i_col;
int i_row;
int i_vout;
- struct vout_list_s
+ struct vout_list_t
{
vlc_bool_t b_active;
int i_width;
p_vout->p_sys->pp_vout = malloc( p_vout->p_sys->i_row *
p_vout->p_sys->i_col *
- sizeof(struct vout_list_s) );
+ sizeof(struct vout_list_t) );
if( p_vout->p_sys->pp_vout == NULL )
{
msg_Err( p_vout, "out of memory" );
* scope.c : Scope effect module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: scope.c,v 1.8 2002/06/01 18:04:48 sam Exp $
+ * $Id: scope.c,v 1.9 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the audio output thread descriptor.
* It describes some scope specific variables.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
aout_thread_t aout;
aout_fifo_t *p_aout_fifo;
* ggi.c : GGI plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: ggi.c,v 1.22 2002/06/02 09:03:54 sam Exp $
+ * $Id: ggi.c,v 1.23 2002/07/20 18:01:42 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* This structure is part of the video output thread descriptor.
* It describes the GGI specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
/* GGI system informations */
ggi_visual_t p_display; /* display device */
* glide.c : 3dfx Glide plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: glide.c,v 1.15 2002/06/01 12:31:59 sam Exp $
+ * $Id: glide.c,v 1.16 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This structure is part of the video output thread descriptor.
* It describes the Glide specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
GrLfbInfo_t p_buffer_info; /* back buffer info */
* gtk_common.h: private Gtk+ interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: gtk_common.h,v 1.11 2002/07/11 19:28:13 sam Exp $
+ * $Id: gtk_common.h,v 1.12 2002/07/20 18:01:42 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* intf_sys_t: description and status of Gtk+ interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
/* special actions */
vlc_bool_t b_playing;
/*****************************************************************************
* intf_sys_t: description and status of KDE interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
KThread *p_thread;
* lirc.c : lirc plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: lirc.c,v 1.13 2002/07/15 20:09:31 sam Exp $
+ * $Id: lirc.c,v 1.14 2002/07/20 18:01:42 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
/*****************************************************************************
* intf_sys_t: description and status of FB interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
struct lirc_config *config;
vlc_mutex_t change_lock;
* aout_macosx.m: CoreAudio output plugin
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.m,v 1.7 2002/06/08 18:52:34 sam Exp $
+ * $Id: aout_macosx.m,v 1.8 2002/07/20 18:01:42 sam Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* This structure is part of the audio output thread descriptor.
* It describes the CoreAudio specific properties of an output thread.
*****************************************************************************/
-struct aout_sys_s
+struct aout_sys_t
{
AudioDeviceID device; // the audio device
AudioConverterRef s_converter; // the AudioConverter
* intf_macosx.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: intf_macosx.h,v 1.2 2002/07/16 20:41:48 jlj Exp $
+ * $Id: intf_macosx.h,v 1.3 2002/07/20 18:01:42 sam Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
/*****************************************************************************
* intf_sys_t: description and status of the interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
NSAutoreleasePool * o_pool;
NSPort * o_sendport;
* vout_macosx.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout_macosx.h,v 1.1 2002/07/15 01:54:04 jlj Exp $
+ * $Id: vout_macosx.h,v 1.2 2002/07/20 18:01:42 sam Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
/*****************************************************************************
* vout_sys_t: MacOS X video output method descriptor
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
intf_thread_t * p_intf;
VLCWindow * o_window;
#define VOUT_REQ_CREATE_WINDOW 0x00000001
#define VOUT_REQ_DESTROY_WINDOW 0x00000002
-typedef struct vout_req_s
+typedef struct vout_req_t
{
int i_type;
int i_result;
* vout_macosx.m: MacOS X video output plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout_macosx.m,v 1.12 2002/07/16 20:41:48 jlj Exp $
+ * $Id: vout_macosx.m,v 1.13 2002/07/20 18:01:42 sam Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
#define QT_MAX_DIRECTBUFFERS 10
-struct picture_sys_s
+struct picture_sys_t
{
void *p_info;
unsigned int i_size;
{
NSArray *o_array;
NSPortMessage *o_msg;
- struct vout_req_s req;
- struct vout_req_s *p_req = &req;
+ struct vout_req_t req;
+ struct vout_req_t *p_req = &req;
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
NSPort *recvPort = [[NSPort port] retain];
* mga.c : Matrox Graphic Array plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: mga.c,v 1.18 2002/06/01 12:32:00 sam Exp $
+ * $Id: mga.c,v 1.19 2002/07/20 18:01:43 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Samuel Hocevar <sam@zoy.org>
# define MGA_NUM_FRAMES 1
-typedef struct mga_vid_config_s
+typedef struct mga_vid_config_t
{
u16 version;
u16 card_type;
} mga_vid_config_t;
#endif
-struct vout_sys_s
+struct vout_sys_t
{
mga_vid_config_t mga;
int i_fd;
byte_t * p_video;
};
-struct picture_sys_s
+struct picture_sys_t
{
int i_frame;
};
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xmga.c,v 1.17 2002/06/04 00:11:12 sam Exp $
+ * $Id: xmga.c,v 1.18 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* This structure is part of the video output thread descriptor.
* It describes the X11 and XVideo specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
/* Internal settings and properties */
Display * p_display; /* display pointer */
*****************************************************************************/
#define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5
-typedef struct mwmhints_s
+typedef struct mwmhints_t
{
u32 flags;
u32 functions;
--- /dev/null
+*.bak
+.dep
+*.lo
+*.o.*
+*.lo.*
* ipv6.c: IPv6 network abstraction layer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.13 2002/07/19 21:14:13 massiot Exp $
+ * $Id: ipv6.c,v 1.14 2002/07/20 18:01:43 sam Exp $
*
* Authors: Alexis Guillard <alexis.guillard@bt.com>
* Christophe Massiot <massiot@via.ecp.fr>
# include <netdb.h> /* hostent ... */
# include <sys/socket.h>
# include <netinet/in.h>
+# include <net/if.h>
# ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
# endif
#include <sys/asoundlib.h>
-struct aout_sys_s
+struct aout_sys_t
{
snd_pcm_t * p_pcm_handle;
int i_card;
#define MODE_VIDEO_MEM 2
#define MODE_VIDEO_OVERLAY 3
-struct vout_sys_s
+struct vout_sys_t
{
/* video mode */
int i_mode;
* This structure is part of the picture descriptor, it describes the
* XVideo specific properties of a direct buffer.
*****************************************************************************/
-struct picture_sys_s
+struct picture_sys_t
{
/* [shared] memory blit */
PhImage_t * p_image;
* intf_qt.cpp: Qt interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_qt.cpp,v 1.16 2002/07/11 18:41:54 sam Exp $
+ * $Id: intf_qt.cpp,v 1.17 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* intf_sys_t: description and status of Qt interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
QApplication *p_app;
IntfWindow *p_window;
* aout_sdl.c : audio sdl functions library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_sdl.c,v 1.29 2002/06/01 12:32:00 sam Exp $
+ * $Id: aout_sdl.c,v 1.30 2002/07/20 18:01:43 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* the overflow limit is used to prevent the fifo from growing too big */
#define OVERFLOWLIMIT 100000
-struct aout_sys_s
+struct aout_sys_t
{
byte_t * audio_buf;
int i_audio_end;
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_sdl.c,v 1.95 2002/06/04 00:11:12 sam Exp $
+ * $Id: vout_sdl.c,v 1.96 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
* This structure is part of the video output thread descriptor.
* It describes the SDL specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
SDL_Surface * p_display; /* display device */
* This structure is part of the picture descriptor, it describes the
* SDL specific properties of a direct buffer.
*****************************************************************************/
-struct picture_sys_s
+struct picture_sys_t
{
SDL_Overlay *p_overlay;
};
* spu_decoder.h : sub picture unit decoder thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: spu_decoder.h,v 1.5 2002/06/01 12:32:00 sam Exp $
+ * $Id: spu_decoder.h,v 1.6 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-struct subpicture_sys_s
+struct subpicture_sys_t
{
mtime_t i_pts; /* presentation timestamp */
/*****************************************************************************
* spudec_thread_t : sub picture unit decoder thread descriptor
*****************************************************************************/
-typedef struct spudec_thread_s
+typedef struct spudec_thread_t
{
/*
* Thread properties and locks
* logger.c : file logging plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: logger.c,v 1.12 2002/07/15 20:09:31 sam Exp $
+ * $Id: logger.c,v 1.13 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* intf_sys_t: description and status of log interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
int i_mode;
* ncurses.c : NCurses plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: ncurses.c,v 1.18 2002/07/15 20:09:31 sam Exp $
+ * $Id: ncurses.c,v 1.19 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* intf_sys_t: description and status of ncurses interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
/* special actions */
vlc_mutex_t change_lock; /* the change lock */
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: rc.c,v 1.21 2002/07/15 20:09:31 sam Exp $
+ * $Id: rc.c,v 1.22 2002/07/20 18:01:43 sam Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
/*****************************************************************************
* intf_sys_t: description and status of rc interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
input_thread_t * p_input;
};
* waveout.c : Windows waveOut plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: waveout.c,v 1.9 2002/06/03 07:22:36 gbazin Exp $
+ * $Id: waveout.c,v 1.10 2002/07/20 18:01:43 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#define NUMBUF 3 /* We use triple buffering to be on the safe side */
-struct aout_sys_s
+struct aout_sys_t
{
HWAVEOUT h_waveout; /* handle to waveout instance */
#include "playlist.h"\r
#include "preferences.h"\r
\r
-typedef struct es_descriptor_s es_descriptor_t;\r
+VLC_DECLARE_STRUCT(es_descriptor_t)\r
\r
/*****************************************************************************\r
* The TrackBar is graduated from 0 to SLIDER_MAX_VALUE.\r
/*****************************************************************************\r
* intf_sys_t: description and status of Win32 interface\r
*****************************************************************************/\r
-struct intf_sys_s\r
+struct intf_sys_t\r
{\r
/* special actions */\r
vlc_bool_t b_playing;\r
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.43 2002/07/17 21:34:57 stef Exp $
+ * $Id: xcommon.c,v 1.44 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
# define IMAGE_FREE XDestroyImage
#endif
-struct x11_window_s;
-typedef struct x11_window_s x11_window_t;
+VLC_DECLARE_STRUCT(x11_window_t)
/*****************************************************************************
* Local prototypes
*****************************************************************************
* This structure contains all the data necessary to describe an X11 window.
*****************************************************************************/
-struct x11_window_s
+struct x11_window_t
{
Window base_window; /* base window */
Window video_window; /* sub-window for displaying video */
* This structure is part of the video output thread descriptor.
* It describes the X11 and XVideo specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_s
+struct vout_sys_t
{
/* Internal settings and properties */
Display * p_display; /* display pointer */
* This structure is part of the picture descriptor, it describes the
* XVideo specific properties of a direct buffer.
*****************************************************************************/
-struct picture_sys_s
+struct picture_sys_t
{
IMAGE_TYPE * p_image;
*****************************************************************************/
#define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5
-typedef struct mwmhints_s
+typedef struct mwmhints_t
{
u32 flags;
u32 functions;
* xosd.c : X On Screen Display interface
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: xosd.c,v 1.3 2002/06/08 02:50:26 lool Exp $
+ * $Id: xosd.c,v 1.4 2002/07/20 18:01:43 sam Exp $
*
* Authors: Loïc Minier <lool@videolan.org>
*
/*****************************************************************************
* intf_sys_t: description and status of rc interface
*****************************************************************************/
-struct intf_sys_s
+struct intf_sys_t
{
input_thread_t * p_input; /* associated input thread */
xosd * p_osd; /* libxosd handle */
* input_ext-plugins.c: useful functions for access and demux plug-ins
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: input_ext-plugins.c,v 1.13 2002/06/27 19:05:17 sam Exp $
+ * $Id: input_ext-plugins.c,v 1.14 2002/07/20 18:01:43 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* data_buffer_t: shared data type
*****************************************************************************/
-struct data_buffer_s
+struct data_buffer_t
{
data_buffer_t * p_next;
unsigned int i_depth; \
} NAME;
-struct input_buffers_s
+struct input_buffers_t
{
vlc_mutex_t lock;
PACKETS_LIFO( pes_packet_t, pes )
* and spawns threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.16 2002/07/18 01:00:41 sam Exp $
+ * $Id: libvlc.c,v 1.17 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
void * p_global_data;
/* A list of all the currently allocated vlc objects */
-static volatile int i_vlc = 0;
-static volatile int i_unique = 0;
-static volatile vlc_t **pp_vlc = NULL;
+static int volatile i_vlc = 0;
+static int volatile i_unique = 0;
+static vlc_t ** volatile pp_vlc = NULL;
/*****************************************************************************
* Local prototypes
* This function allocates a vlc_t structure and returns NULL in case of
* failure. Also, the thread system and the signal handlers are initialized.
*****************************************************************************/
-vlc_t * vlc_create( void )
+vlc_error_t vlc_create( void )
+{
+ vlc_t * p_vlc = vlc_create_r();
+ return p_vlc ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+vlc_t * vlc_create_r( void )
{
vlc_t * p_vlc = NULL;
* - message queue, module bank and playlist initialization
* - configuration and commandline parsing
*****************************************************************************/
-vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+vlc_error_t vlc_init( int i_argc, char *ppsz_argv[] )
+{
+ return vlc_init_r( ( i_vlc == 1 ) ? *pp_vlc : NULL, i_argc, ppsz_argv );
+}
+
+vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
{
char p_capabilities[200];
char *psz_module;
* separate thread. If b_block is set to 1, vlc_add_intf will continue until
* user requests to quit.
*****************************************************************************/
-vlc_error_t vlc_run( vlc_t *p_vlc )
+vlc_error_t vlc_run( void )
+{
+ return vlc_run_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_run_r( vlc_t *p_vlc )
{
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
* separate thread. If b_block is set to 1, vlc_add_intf will continue until
* user requests to quit.
*****************************************************************************/
-vlc_error_t vlc_add_intf( vlc_t *p_vlc, const char *psz_module,
- vlc_bool_t b_block )
+vlc_error_t vlc_add_intf( const char *psz_module, vlc_bool_t b_block )
+{
+ return vlc_add_intf_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
+ psz_module, b_block );
+}
+
+vlc_error_t vlc_add_intf_r( vlc_t *p_vlc, const char *psz_module,
+ vlc_bool_t b_block )
{
vlc_error_t err;
intf_thread_t *p_intf;
* This function requests the interface threads to finish, waits for their
* termination, and destroys their structure.
*****************************************************************************/
-vlc_error_t vlc_stop( vlc_t *p_vlc )
+vlc_error_t vlc_stop( void )
+{
+ return vlc_stop_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_stop_r( vlc_t *p_vlc )
{
intf_thread_t *p_intf;
playlist_t *p_playlist;
* This function uninitializes every vlc component that was activated in
* vlc_init: audio and video outputs, playlist, module bank and message queue.
*****************************************************************************/
-vlc_error_t vlc_end( vlc_t *p_vlc )
+vlc_error_t vlc_end( void )
+{
+ return vlc_end_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_end_r( vlc_t *p_vlc )
{
/* Check that the handle is valid */
if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
*****************************************************************************
* This function frees the previously allocated vlc_t structure.
*****************************************************************************/
-vlc_error_t vlc_destroy( vlc_t *p_vlc )
+vlc_error_t vlc_destroy( void )
+{
+ return vlc_destroy_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_error_t vlc_destroy_r( vlc_t *p_vlc )
{
int i_index;
return VLC_SUCCESS;
}
-vlc_status_t vlc_status( vlc_t *p_vlc )
+vlc_status_t vlc_status( void )
+{
+ return vlc_status_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
+}
+
+vlc_status_t vlc_status_r( vlc_t *p_vlc )
{
if( !p_vlc )
{
return p_vlc->i_status;
}
-vlc_error_t vlc_add_target( vlc_t *p_vlc, const char *psz_target,
- int i_mode, int i_pos )
+vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos )
+{
+ return vlc_add_target_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
+ psz_target, i_mode, i_pos );
+}
+
+vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target,
+ int i_mode, int i_pos )
{
vlc_error_t err;
playlist_t *p_playlist;
/* We assume that the remaining parameters are filenames */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
{
- vlc_add_target( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ],
+ PLAYLIST_APPEND, PLAYLIST_END );
}
return VLC_SUCCESS;
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.71 2002/07/04 18:11:57 sam Exp $
+ * $Id: modules.c,v 1.72 2002/07/20 18:01:43 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
module_t * __module_Need( vlc_object_t *p_this, int i_capability,
const char *psz_name, void *p_data )
{
- typedef struct module_list_s module_list_t;
+ typedef struct module_list_t module_list_t;
- struct module_list_s
+ struct module_list_t
{
module_t *p_module;
int i_score;
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.71 2002/06/07 23:53:44 sam Exp $
+ * $Id: netutils.c,v 1.72 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
* as it depends on the VideoLAN channel server, which isn't frozen for
* the time being.
*****************************************************************************/
-struct input_channel_s
+struct input_channel_t
{
int i_channel; /* current channel number */
mtime_t last_change; /* last change date */
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: threads.c,v 1.9 2002/07/16 21:29:10 sam Exp $
+ * $Id: threads.c,v 1.10 2002/07/20 18:01:43 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
int setitimer(int kind, const struct itimerval* itnew, struct itimerval* itold);
# endif /* WIN32 */
-typedef struct wrapper_s
+typedef struct wrapper_t
{
/* Data lock access */
vlc_mutex_t lock;
* video_text.c : text manipulation functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video_text.c,v 1.35 2002/06/01 12:32:02 sam Exp $
+ * $Id: video_text.c,v 1.36 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Therefore the border masks can't be complete if the font has pixels on the
* border.
*****************************************************************************/
-struct vout_font_s
+struct vout_font_t
{
int i_type; /* font type */
int i_width; /* character width in pixels */
* vlc.c: the vlc player
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vlc.c,v 1.5 2002/07/18 01:00:41 sam Exp $
+ * $Id: vlc.c,v 1.6 2002/07/20 18:01:43 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*****************************************************************************/
int main(int i_argc, char *ppsz_argv[], char *ppsz_env[])
{
- vlc_t *p_vlc;
vlc_error_t err;
#ifdef SYS_LINUX
#endif
/* Create the vlc structure */
- p_vlc = vlc_create();
- if( p_vlc == NULL )
+ err = vlc_create();
+ if( err != VLC_SUCCESS )
{
- return -1;
+ return err;
}
/* Initialize vlc */
- err = vlc_init( p_vlc, i_argc, ppsz_argv );
+ err = vlc_init( i_argc, ppsz_argv );
if( err != VLC_SUCCESS )
{
- vlc_destroy( p_vlc );
+ vlc_destroy();
return err;
}
- //vlc_add( p_vlc, "/home/sam/videolan/streams/mpeg/axe.mpeg" );
-
/* Run vlc, in non-blocking mode */
- err = vlc_run( p_vlc );
+ err = vlc_run();
/* Add background interfaces */
- //{ int i; for( i=10; i--; ) vlc_add_intf( p_vlc, "dummy", 0 ); }
- //vlc_add_intf( p_vlc, "dummy", VLC_FALSE );
- //vlc_add_intf( p_vlc, "logger", VLC_FALSE );
- //vlc_add_intf( p_vlc, "xosd", VLC_FALSE );
- //vlc_add_intf( p_vlc, "gtk", VLC_FALSE );
- //vlc_add_intf( p_vlc, "kde", VLC_FALSE );
- vlc_add_intf( p_vlc, "rc", VLC_FALSE );
+ //{ int i; for( i=10; i--; ) vlc_add_intf( NULL, "dummy", 0 ); }
+ //vlc_add_intf( NULL, "dummy", VLC_FALSE );
+ //vlc_add_intf( NULL, "logger", VLC_FALSE );
+ //vlc_add_intf( NULL, "xosd", VLC_FALSE );
+ //vlc_add_intf( NULL, "gtk", VLC_FALSE );
+ //vlc_add_intf( NULL, "kde", VLC_FALSE );
+ vlc_add_intf( "rc", VLC_FALSE );
/* Add a blocking interface and keep the return value */
- err = vlc_add_intf( p_vlc, NULL, VLC_TRUE );
+ err = vlc_add_intf( NULL, VLC_TRUE );
/* Finish the interface */
- vlc_stop( p_vlc );
+ vlc_stop();
/* Finish all threads */
- vlc_end( p_vlc );
+ vlc_end();
/* Destroy the vlc structure */
- vlc_destroy( p_vlc );
+ vlc_destroy();
return err;
}
--- /dev/null
+#!/bin/sh
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+exec_prefix_set=no
+
+usage()
+{
+ cat <<EOF
+Usage: vlc-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Libraries:
+ vlc
+ plugin
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_vlc=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ if test $exec_prefix_set = no ; then
+ exec_prefix=$optarg
+ fi
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ exec_prefix_set=yes
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --version)
+ echo @VERSION@
+ exit 0
+ ;;
+ --cflags)
+ if test "@includedir@" != /usr/include ; then
+ includes="-I@includedir@ @vlc_CFLAGS@"
+ fi
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+if test "$echo_cflags" = "yes"; then
+ echo -I@INCLUDE@ $includes
+fi
+if test "$echo_libs" = "yes"; then
+ echo "-L@libdir@ -lvlc @libvlc_LDFLAGS@"
+fi
projects / vlc / commitdiff