Commit 440f9992 authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed the BeOS compile typo.
  * The ALSA plugin is back.
  * A gift for Gildas: plugins don't rely on backlinking any more. The
    drawback is the dirty magic in include/modules_export.h which has to
    be included whenever a module needs one of the functions in it. But
     a) we should less and less rely on those functions
     b) no plugin code modification was needed

   The BeOS and MacOS X modules may be broken when compiled as plugins,
   I'll check this later when I can reboot under BeOS.
parent 1ffe943e
......@@ -14,13 +14,13 @@ Here is a shortcut to copy-paste for a complete build:
make distclean && ./configure --prefix=/usr --enable-gnome \
--enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa
If you intend to debug stuff, you may want to disable optimizations:
make distclean && ./configure --prefix=/usr --enable-gnome \
--enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
--enable-mga --enable-gtk --enable-qt --enable-xvideo \
--enable-mga --enable-gtk --enable-qt --enable-xvideo --enable-alsa \
--enable-debug
......
......@@ -39,8 +39,7 @@ INTERFACE = src/interface/main.o \
src/interface/interface.o \
src/interface/intf_msg.o \
src/interface/intf_playlist.o \
src/interface/intf_channels.o \
src/interface/intf_urldecode.o \
src/interface/intf_channels.o
INPUT = src/input/input.o \
src/input/input_ext-dec.o \
......@@ -328,7 +327,7 @@ $(CPP_OBJ): %.o: %.cpp
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB)
ifeq ($(SYS),beos)
rm -f ./lib/_APP_
ln -s ../vlc ./lib/_APP_
......
......@@ -59,7 +59,7 @@ $(CPP_DEP): %.dpp: FORCE
$(PLUGIN_C): %.o: .dep/%.d
$(PLUGIN_C): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $<
$(BUILTIN_C): BUILTIN_%.o: .dep/%.d
$(BUILTIN_C): BUILTIN_%.o: %.c
......@@ -67,7 +67,7 @@ $(BUILTIN_C): BUILTIN_%.o: %.c
$(PLUGIN_CPP): %.o: .dep/%.dpp
$(PLUGIN_CPP): %.o: %.cpp
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(CC) $(CFLAGS) -DPLUGIN $(PCFLAGS) -c -o $@ $<
$(BUILTIN_CPP): BUILTIN_%.o: .dep/%.dpp
$(BUILTIN_CPP): BUILTIN_%.o: %.cpp
......
......@@ -213,20 +213,6 @@ LCFLAGS += @LCFLAGS@ $(LIB)
LCFLAGS += -Wall
#LCFLAGS += -s
ifeq ($(SYS),beos)
LCFLAGS += -Xlinker -soname=_APP_
else
ifneq (,$(findstring qnx,$(SYS)))
LCFLAGS += -Xlinker -export-dynamic
else
ifneq (,$(findstring darwin,$(SYS)))
LCFLAGS += -dyn
else
LCFLAGS += --export-dynamic
endif
endif
endif
#
# Debugging and profiling support
#
......
This diff is collapsed.
......@@ -109,13 +109,6 @@ void foo() { int meuh; ntohl(meuh); }],,
AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
dnl Check for -rdynamic flag
CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
AC_MSG_CHECKING([if \$CC miserably fails with the -rdynamic flag])
AC_TRY_COMPILE([],,
LCFLAGS="${LCFLAGS} -rdynamic"
AC_MSG_RESULT(no), AC_MSG_RESULT(yes))
dnl End of the bizarre compilation tests
CFLAGS="${save_CFLAGS}"
......@@ -412,9 +405,9 @@ AC_ARG_WITH(glide,
PLUGINS="${PLUGINS} glide";
if test "x$withval" != "xyes";
then
LIB_GLIDE="-l"$withval
LIB_GLIDE="-l"$withval" -lm"
else
LIB_GLIDE="-lglide2x"
LIB_GLIDE="-lglide2x -lm"
fi
fi ])
......
......@@ -2,27 +2,27 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.1-dev, libqt-dev
Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev
Standards-Version: 3.0.1
Package: vlc
Architecture: any
Depends: ${shlibs:Depends}, vlc-gui
Suggests: vlc-sdl, vlc-esd, vlc-gnome
Description: the free MPEG and DVD player VideoLAN Client
Description: a free MPEG and DVD player
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This is the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted
This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted
DVDs, or MPEG streams from a network source.
Package: vlc-gnome
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Provides: vlc-gui
Description: Gnome plugin for the VideoLAN Client
Description: Gnome plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a Gnome interface to the VideoLAN Client.
This plugin adds a Gnome interface to vlc, the VideoLAN Client.
Package: vlc-gtk
Architecture: any
......@@ -30,50 +30,59 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Replaces: vlc-gnome (<= 0.2.63-2)
Conflicts: vlc-gnome (<= 0.2.63-2)
Provides: vlc-gui
Description: Gtk+ plugin for the VideoLAN Client
Description: Gtk+ plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a Gtk+ interface to the VideoLAN Client.
This plugin adds a Gtk+ interface to vlc, the VideoLAN Client.
Package: vlc-esd
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: Esound plugin for the VideoLAN Client
Description: Esound plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for the Enlightened Sound Daemon to
the VideoLAN Client.
vlc, the VideoLAN Client.
Package: vlc-alsa
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: ALSA plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for the Advanced Linux Sound Architecture to
vlc, the VideoLAN Client.
Package: vlc-sdl
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: SDL plugin for the VideoLAN Client
Description: SDL plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds support for the Simple DirectMedia Layer library to
the VideoLAN Client.
vlc, the VideoLAN Client.
Package: vlc-ggi
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: GGI plugin for the VideoLAN Client
Description: GGI plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This is a GGI plugin for the VideoLAN Client.
This is a GGI plugin for vlc, the VideoLAN Client.
Package: vlc-glide
Architecture: i386
Depends: vlc (= ${Source-Version}), libglide2
Description: Glide plugin for the VideoLAN Client
Description: Glide plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This is a Glide (3dfx) plugin for the VideoLAN Client.
This is a Glide (3dfx) plugin for vlc, the VideoLAN Client.
Package: vlc-qt
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Provides: vlc-gui
Description: Qt plugin for the VideoLAN Client
Description: Qt plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds a Qt interface to the VideoLAN Client.
This plugin adds a Qt interface to vlc, the VideoLAN Client.
......@@ -8,8 +8,8 @@ Standards-Version: 3.0.1
Package: vlc-css
Architecture: any
Depends: ${shlibs:Depends}, vlc (= ${Source-Version})
Description: CSS plugin for the VideoLAN Client
Description: CSS plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
This plugin adds DVD support with CSS decryption to the VideoLAN Client.
This plugin adds DVD support with CSS decryption to vlc, the VideoLAN Client.
......@@ -17,14 +17,14 @@ build-stamp:
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-gnome --enable-gtk --enable-fb --with-glide \
--with-ggi --with-sdl --enable-esd \
--with-ggi --with-sdl --enable-esd --enable-alsa \
--enable-qt --disable-ppro ; \
else \
./configure --prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-gnome --enable-gtk --enable-fb \
--with-ggi --with-sdl --enable-esd \
--with-ggi --with-sdl --enable-esd --enable-alsa \
--enable-qt ; \
fi
......@@ -50,7 +50,7 @@ install: build
DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
# make symlinks for packages
aliases="ggi gtk gnome esd sdl qt" ; \
aliases="ggi gtk gnome esd sdl qt alsa" ; \
if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \
for alias in `echo $$aliases` ; do \
mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \
......@@ -123,10 +123,10 @@ binary-arch: build install
# dh_installpam
# dh_installinit
#dh_installcron
# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt doc/vlc.1
# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt doc/vlc.1
#dh_installinfo
# dh_undocumented
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt
dh_link
dh_strip
dh_compress
......@@ -147,3 +147,4 @@ binary-arch: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
......@@ -2,7 +2,7 @@
* audio_output.h : audio output thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: audio_output.h,v 1.36 2001/05/30 05:19:03 stef Exp $
* $Id: audio_output.h,v 1.37 2001/05/30 17:03:11 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
*
......@@ -26,7 +26,7 @@
*****************************************************************************
* This global variable is accessed by any function using the audio output.
*****************************************************************************/
typedef struct
typedef struct aout_bank_s
{
/* Array to all the audio outputs */
struct aout_thread_s *pp_aout[ AOUT_MAX_THREADS ];
......
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.31 2001/04/28 03:36:25 sam Exp $
* $Id: common.h,v 1.32 2001/05/30 17:03:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -135,6 +135,7 @@ typedef struct video_parser_s * p_video_parser_t;
/* Misc */
struct macroblock_s;
struct data_packet_s;
struct es_descriptor_s;
/*****************************************************************************
* Macros and inline functions
......
/* include/defs.h.in. Generated automatically from configure.in by autoheader. */
/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define to empty if the keyword does not work. */
#undef const
......
......@@ -2,7 +2,7 @@
* input.h: structures of the input not exported to other modules
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input.h,v 1.36 2001/04/25 10:22:32 massiot Exp $
* $Id: input.h,v 1.37 2001/05/30 17:03:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -45,20 +45,6 @@ void InitBitstream ( struct bit_stream_s *, struct decoder_fifo_s *,
void * p_callback_arg );
void NextDataPacket ( struct bit_stream_s * );
/*****************************************************************************
* Prototypes from input.c to open files
*****************************************************************************/
void input_FileOpen ( struct input_thread_s * );
void input_FileClose( struct input_thread_s * );
/*****************************************************************************
* Prototypes from input.c to open a network socket
*****************************************************************************/
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
void input_NetworkOpen ( struct input_thread_s * );
void input_NetworkClose( struct input_thread_s * );
#endif
/*****************************************************************************
* Prototypes from input_programs.c
*****************************************************************************/
......
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.37 2001/05/19 00:39:29 stef Exp $
* $Id: input_ext-intf.h,v 1.38 2001/05/30 17:03:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -294,6 +294,14 @@ typedef struct input_thread_s
* backwards (it's gonna be fun) */
void (* pf_seek)( struct input_thread_s *, off_t );
/* Special callback functions */
void (* pf_file_open ) ( struct input_thread_s * );
void (* pf_file_close ) ( struct input_thread_s * );
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
void (* pf_network_open ) ( struct input_thread_s * );
void (* pf_network_close ) ( struct input_thread_s * );
#endif
i_p_config_t i_p_config; /* plugin configuration */
char * p_source;
......
......@@ -2,7 +2,7 @@
* intf_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_playlist.h,v 1.3 2001/05/15 01:01:44 stef Exp $
* $Id: intf_playlist.h,v 1.4 2001/05/30 17:03:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -78,4 +78,5 @@ void intf_PlaylistNext ( playlist_t * p_playlist );
void intf_PlaylistPrev ( playlist_t * p_playlist );
void intf_PlaylistDestroy ( playlist_t * p_playlist );
void intf_PlaylistJumpto ( playlist_t * p_playlist , int i_pos);
void intf_UrlDecode ( char * );
/*
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public Licensse as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
void urldecode_path(char *);
......@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: main.h,v 1.18 2001/05/06 04:32:02 sam Exp $
* $Id: main.h,v 1.19 2001/05/30 17:03:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -33,7 +33,7 @@
* should only be used by interface thread.
*****************************************************************************/
typedef struct
typedef struct main_s
{
/* Global properties */
int i_argc; /* command line arguments count */
......
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.24 2001/05/15 16:19:42 sam Exp $
* $Id: modules.h,v 1.25 2001/05/30 17:03:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -178,7 +178,7 @@ typedef struct function_list_s
dctelem_t *, int );
void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] );
void ( * pf_vdec_init ) ( struct vdec_thread_s * );
void ( * pf_decode_init ) ( struct vdec_thread_s * );
void ( * pf_decode_mb_c ) ( struct vdec_thread_s *,
struct macroblock_s * );
void ( * pf_decode_mb_bw ) ( struct vdec_thread_s *,
......@@ -313,10 +313,11 @@ typedef struct module_s
struct module_s * next; /* Next module */
struct module_s * prev; /* Previous module */
module_config_t * p_config; /* Module configuration structure table */
module_config_t *p_config; /* Module configuration structure */
struct module_symbols_s *p_symbols;
u32 i_capabilities; /* Capability list */
p_module_functions_t p_functions; /* Capability functions */
u32 i_capabilities; /* Capability list */
p_module_functions_t p_functions; /* Capability functions */
} module_t;
......
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.6 2001/03/21 13:42:33 sam Exp $
* $Id: modules_inner.h,v 1.7 2001/05/30 17:03:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -56,18 +56,82 @@
/* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */
#ifdef BUILTIN
# define _M( function ) CONCATENATE( MODULE_NAME, function )
# define MODULE_INIT \
int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module )
# define MODULE_ACTIVATE \
int CONCATENATE( MODULE_NAME, ActivateModule ) ( module_t *p_module )
# define MODULE_DEACTIVATE \
int CONCATENATE( MODULE_NAME, DeactivateModule )( module_t *p_module )
# define MODULE_INIT_START \
int CONCATENATE( MODULE_NAME, InitModule ) ( module_t *p_module ) \
{ \
p_module->psz_name = MODULE_STRING; \
p_module->psz_version = VERSION;
# define MODULE_INIT_STOP \
return( 0 ); \
}
# define MODULE_ACTIVATE_START \
int CONCATENATE( MODULE_NAME, ActivateModule ) ( module_t *p_module ) \
{ \
p_module->p_functions = \
( module_functions_t * )malloc( sizeof( module_functions_t ) ); \
if( p_module->p_functions == NULL ) \
{ \
return( -1 ); \
} \
p_module->p_config = p_config;
# define MODULE_ACTIVATE_STOP \
return( 0 ); \
}
# define MODULE_DEACTIVATE_START \
int CONCATENATE( MODULE_NAME, DeactivateModule )( module_t *p_module ) \
{ \
free( p_module->p_functions );
# define MODULE_DEACTIVATE_STOP \
return( 0 ); \
}
#else
# define _M( function ) function
# define MODULE_INIT int InitModule ( module_t *p_module )
# define MODULE_ACTIVATE int ActivateModule ( module_t *p_module )
# define MODULE_DEACTIVATE int DeactivateModule ( module_t *p_module )
# define MODULE_INIT_START \
int InitModule ( module_t *p_module ) \
{ \
p_module->psz_name = MODULE_STRING; \
p_module->psz_version = VERSION;
# define MODULE_INIT_STOP \
return( 0 ); \
}
# define MODULE_ACTIVATE_START \
int ActivateModule ( module_t *p_module ) \
{ \
p_module->p_functions = \
( module_functions_t * )malloc( sizeof( module_functions_t ) ); \
if( p_module->p_functions == NULL ) \
{ \
return( -1 ); \
} \
p_module->p_config = p_config; \
p_symbols = p_module->p_symbols;
# define MODULE_ACTIVATE_STOP \
return( 0 ); \
}
# define MODULE_DEACTIVATE_START \
int DeactivateModule( module_t *p_module ) \
{ \
free( p_module->p_functions );
# define MODULE_DEACTIVATE_STOP \
return( 0 ); \
}
#endif
/* Now the real stuff */
......@@ -76,11 +140,18 @@
/*****************************************************************************
* Macros used to build the configuration structure.
*****************************************************************************/
#define MODULE_CONFIG_START \
static module_config_t p_config[] = { \
{ MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL },
#ifdef BUILTIN
# define MODULE_CONFIG_START \
static module_config_t p_config[] = { \
{ MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL },
#else
# define MODULE_CONFIG_START \
module_symbols_t* p_symbols; \
static module_config_t p_config[] = { \
{ MODULE_CONFIG_ITEM_START, NULL, NULL, NULL, NULL },
#endif
#define MODULE_CONFIG_END \
#define MODULE_CONFIG_STOP \
{ MODULE_CONFIG_ITEM_END, NULL, NULL, NULL, NULL } \
};
......@@ -107,3 +178,4 @@ static module_config_t p_config[] = { \
#define ADD_SPIN( text, name, p_getlist, p_update ) \
{ MODULE_CONFIG_ITEM_SPIN, text, name, p_getlist, p_update },
......@@ -4,7 +4,7 @@
* modules.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.h,v 1.13 2001/05/28 02:38:48 sam Exp $
* $Id: netutils.h,v 1.14 2001/05/30 17:03:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Henri Fallon <henri@videolan.org>
......@@ -34,3 +34,4 @@ int network_BuildLocalAddr ( struct sockaddr_in *, int, char * );
int network_BuildRemoteAddr( struct sockaddr_in *, char * );
int network_ChannelJoin ( int );
int network_ChannelCreate ( void );
......@@ -2,7 +2,7 @@
* tests.h: several test functions needed by the plugins
*****************************************************************************
* Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN
* $Id: tests.h,v 1.10 2001/05/14 15:58:03 reno Exp $
* $Id: tests.h,v 1.11 2001/05/30 17:03:11 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -34,8 +34,7 @@
/*****************************************************************************
* TestVersion: tests if the given string equals the current version
*****************************************************************************/
int TestVersion ( char * psz_version );
int TestProgram ( char * psz_program );
int TestMethod ( char * psz_var, char * psz_method );
int TestCPU ( int i_capabilities );
int TestProgram ( char * );
int TestMethod ( char *, char * );
int TestCPU ( int );
......@@ -2,7 +2,7 @@
* video_decoder.h : video decoder thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_decoder.h,v 1.23 2001/05/06 04:32:02 sam Exp $
* $Id: video_decoder.h,v 1.24 2001/05/30 17:03:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -55,7 +55,7 @@ typedef struct vdec_thread_s
dctelem_t p_pre_idct[64*64];
/* Macroblock copy functions */
void ( * pf_vdec_init ) ( struct vdec_thread_s * );
void ( * pf_decode_init ) ( struct vdec_thread_s * );
void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * );
void ( * pf_decode_mb_bw )( struct vdec_thread_s *, struct macroblock_s * );
......
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppenned video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.60 2001/05/06 18:32:30 stef Exp $
* $Id: video_output.h,v 1.61 2001/05/30 17:03:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -29,7 +29,7 @@
*****************************************************************************
* This global variable is accessed by any function using the video output.
*****************************************************************************/
typedef struct
typedef struct vout_bank_s
{
/* Array to all the video outputs */
struct vout_thread_s *pp_vout[ VOUT_MAX_THREADS ];
......@@ -195,14 +195,15 @@ typedef struct vout_thread_s
/* Plugin used and shortcuts to access its capabilities */
struct module_s * p_module;
int ( *pf_create ) ( struct vout_thread_s * );
int ( *pf_init ) ( struct vout_thread_s * );
void ( *pf_end ) ( struct vout_thread_s * );
void ( *pf_destroy ) ( struct vout_thread_s * );
int ( *pf_manage ) ( struct vout_thread_s * );
void ( *pf_display ) ( struct vout_thread_s * );
void ( *pf_setpalette ) ( struct vout_thread_s *, u16 *red,
u16 *green, u16 *blue, u16 *transp );
int ( *pf_create ) ( struct vout_thread_s * );
int ( *pf_init ) ( struct vout_thread_s * );
void ( *pf_end ) ( struct vout_thread_s * );
void ( *pf_destroy ) ( struct vout_thread_s * );
int ( *pf_manage ) ( struct vout_thread_s * );
void ( *pf_display ) ( struct vout_thread_s * );
void ( *pf_setpalette ) ( struct vout_thread_s *, u16 *red,
u16 *green, u16 *blue, u16 *transp );
void ( *pf_setbuffers ) ( struct vout_thread_s *, void *, void * );
/* Pictures and rendering properties */
boolean_t b_grayscale; /* color or grayscale display */
......@@ -296,5 +297,3 @@ subpicture_t * vout_CreateSubPicture ( vout_thread_t *p_vout, int i_type, int
void vout_DestroySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic );
void vout_DisplaySubPicture ( vout_thread_t *p_vout, subpicture_t *p_subpic );
void vout_SetBuffers ( vout_thread_t *p_vout, void *p_buf1, void *p_buf2 );
......@@ -2,7 +2,7 @@
* video_parser.h : video parser thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_parser.h,v 1.34 2001/05/06 04:32:02 sam Exp $
* $Id: video_parser.h,v 1.35 2001/05/30 17:03:11 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -141,7 +141,7 @@ typedef struct vpar_thread_s
void ( * pf_sparse_idct ) ( struct vdec_thread_s *, dctelem_t*, int );
void ( * pf_idct ) ( struct vdec_thread_s *, dctelem_t*, int );
void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] );
void ( * pf_vdec_init ) ( struct vdec_thread_s * );
void ( * pf_decode_init ) ( struct vdec_thread_s * );
void ( * pf_decode_mb_c ) ( struct vdec_thread_s *, struct macroblock_s * );
void ( * pf_decode_mb_bw )( struct vdec_thread_s *, struct macroblock_s * );
......
......@@ -2,7 +2,7 @@
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: alsa.c,v 1.9 2001/04/27 16:08:26 sam Exp $
* $Id: alsa.c,v 1.10 2001/05/30 17:03:11 sam Exp $
*
* Authors: Henri Fallon <henri@videolan.org>
*
......@@ -38,13 +38,7 @@
#include "mtime.h"
#include "modules.h"
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
MODULE_CONFIG_START
ADD_COMMENT( "Yeah, alsa rocks !" )
MODULE_CONFIG_END
#include "modules_export.h"
/*****************************************************************************
* Capabilities defined in the other files.
......@@ -52,59 +46,22 @@ MODULE_CONFIG_END