Skip to content

GitLab

V
vlc
Commit 71ec135b authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ALL: got rid of p_object->p_this which is now useless.

parent 3722c40b
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 306 deletions
include/audio_output.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* audio_output.h : audio output thread interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: audio_output.h,v 1.47 2002/06/01 12:31:57 sam Exp $
* $Id: audio_output.h,v 1.48 2002/06/01 18:04:48 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
......@@ -185,7 +185,8 @@ struct aout_thread_s
aout_thread_t * aout_CreateThread ( vlc_object_t *, int, int );
void aout_DestroyThread ( aout_thread_t * );
VLC_EXPORT( aout_fifo_t *, aout_CreateFifo, ( vlc_object_t *, int, int, int, int, void * ) );
VLC_EXPORT( void, aout_DestroyFifo, ( aout_fifo_t *p_fifo ) );
void aout_FreeFifo ( aout_fifo_t *p_fifo );
#define aout_CreateFifo(a,b,c,d,e,f) __aout_CreateFifo(CAST_TO_VLC_OBJECT(a),b,c,d,e,f)
VLC_EXPORT( aout_fifo_t *, __aout_CreateFifo, ( vlc_object_t *, int, int, int, int, void * ) );
VLC_EXPORT( void, aout_DestroyFifo, ( aout_fifo_t *p_fifo ) );
void aout_FreeFifo ( aout_fifo_t *p_fifo );
include/configuration.h
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: configuration.h,v 1.12 2002/06/01 12:31:57 sam Exp $
* $Id: configuration.h,v 1.13 2002/06/01 18:04:48 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -74,10 +74,10 @@ VLC_EXPORT( void, __config_PutFloat, (vlc_object_t *, const char *, float) );
VLC_EXPORT( char *, __config_GetPsz, (vlc_object_t *, const char *) );
VLC_EXPORT( void, __config_PutPsz, (vlc_object_t *, const char *, char *) );
VLC_EXPORT( int, config_LoadCmdLine, ( vlc_object_t *, int *, char *[], vlc_bool_t ) );
VLC_EXPORT( char *, config_GetHomeDir, ( void ) );
VLC_EXPORT( int, config_LoadConfigFile, ( vlc_object_t *, const char * ) );
VLC_EXPORT( int, config_SaveConfigFile, ( vlc_object_t *, const char * ) );
VLC_EXPORT( int, __config_LoadCmdLine, ( vlc_object_t *, int *, char *[], vlc_bool_t ) );
VLC_EXPORT( char *, config_GetHomeDir, ( void ) );
VLC_EXPORT( int, __config_LoadConfigFile, ( vlc_object_t *, const char * ) );
VLC_EXPORT( int, __config_SaveConfigFile, ( vlc_object_t *, const char * ) );
VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char *psz_name ) );
VLC_EXPORT( void, config_Duplicate, ( module_t *, module_config_t * ) );
......@@ -93,6 +93,10 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
#define config_GetPsz(a,b) __config_GetPsz(CAST_TO_VLC_OBJECT(a),b)
#define config_PutPsz(a,b,c) __config_PutPsz(CAST_TO_VLC_OBJECT(a),b,c)
#define config_LoadCmdLine(a,b,c,d) __config_LoadCmdLine(CAST_TO_VLC_OBJECT(a),b,c,d)
#define config_LoadConfigFile(a,b) __config_LoadConfigFile(CAST_TO_VLC_OBJECT(a),b)
#define config_SaveConfigFile(a,b) __config_SaveConfigFile(CAST_TO_VLC_OBJECT(a),b)
/*****************************************************************************
* Macros used to build the configuration structure.
*
......
include/input_ext-intf.h
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.67 2002/06/01 12:31:57 sam Exp $
* $Id: input_ext-intf.h,v 1.68 2002/06/01 18:04:48 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -325,8 +325,9 @@ struct input_thread_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
input_thread_t * input_CreateThread ( vlc_object_t *,
playlist_item_t *, int * );
#define input_CreateThread(a,b,c) __input_CreateThread(CAST_TO_VLC_OBJECT(a),b,c)
input_thread_t * __input_CreateThread ( vlc_object_t *,
playlist_item_t *, int * );
void input_StopThread ( input_thread_t *, int *pi_status );
void input_DestroyThread ( input_thread_t * );
......
include/input_ext-plugins.h
View file @ 71ec135b
......@@ -3,7 +3,7 @@
* but exported to plug-ins
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: input_ext-plugins.h,v 1.29 2002/06/01 12:31:57 sam Exp $
* $Id: input_ext-plugins.h,v 1.30 2002/06/01 18:04:48 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -73,8 +73,10 @@ VLC_EXPORT( mtime_t, input_ClockGetTS, ( input_thread_t *, pgrm_descriptor_t *,
/*****************************************************************************
* Prototypes from input_ext-plugins.h (buffers management)
*****************************************************************************/
VLC_EXPORT( void *, input_BuffersInit, ( vlc_object_t * ) );
VLC_EXPORT( void, input_BuffersEnd, ( input_thread_t *, input_buffers_t * ) );
#define input_BuffersInit(a) __input_BuffersInit(CAST_TO_VLC_OBJECT(a))
void * __input_BuffersInit( vlc_object_t * );
VLC_EXPORT( void, input_BuffersEnd, ( input_thread_t *, input_buffers_t * ) );
VLC_EXPORT( data_buffer_t *, input_NewBuffer, ( input_buffers_t *, size_t ) );
VLC_EXPORT( void, input_ReleaseBuffer, ( input_buffers_t *, data_buffer_t * ) );
VLC_EXPORT( data_packet_t *, input_ShareBuffer, ( input_buffers_t *, data_buffer_t * ) );
......
include/interface.h
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: interface.h,v 1.29 2002/06/01 12:31:57 sam Exp $
* $Id: interface.h,v 1.30 2002/06/01 18:04:48 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -55,14 +55,9 @@ struct intf_thread_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
intf_thread_t * intf_Create ( vlc_object_t * );
vlc_error_t intf_RunThread ( intf_thread_t * );
void intf_StopThread ( intf_thread_t * );
void intf_Destroy ( intf_thread_t * );
void msg_Create ( vlc_object_t * );
void msg_Destroy ( vlc_object_t * );
VLC_EXPORT( msg_subscription_t*, msg_Subscribe, ( vlc_object_t * ) );
VLC_EXPORT( void, msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) );
#define intf_Create(a) __intf_Create(CAST_TO_VLC_OBJECT(a))
intf_thread_t * __intf_Create ( vlc_object_t * );
vlc_error_t intf_RunThread ( intf_thread_t * );
void intf_StopThread ( intf_thread_t * );
void intf_Destroy ( intf_thread_t * );
include/intf_eject.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* intf_eject.h: CD/DVD-ROM ejection handling functions
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: intf_eject.h,v 1.3 2002/06/01 12:31:57 sam Exp $
* $Id: intf_eject.h,v 1.4 2002/06/01 18:04:48 sam Exp $
*
* Author: Julien Blache <jb@technologeek.org>
*
......@@ -21,5 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
VLC_EXPORT( int, intf_Eject, ( vlc_object_t *, const char * ) );
#define intf_Eject(a,b) __intf_Eject(CAST_TO_VLC_OBJECT(a),b)
VLC_EXPORT( int, __intf_Eject, ( vlc_object_t *, const char * ) );
include/modules.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.52 2002/06/01 12:31:57 sam Exp $
* $Id: modules.h,v 1.53 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -316,16 +316,22 @@ struct module_functions_s
/*****************************************************************************
* Exported functions.
*****************************************************************************/
void module_InitBank ( vlc_object_t * );
void module_LoadMain ( vlc_object_t * );
void module_LoadBuiltins ( vlc_object_t * );
void module_LoadPlugins ( vlc_object_t * );
void module_EndBank ( vlc_object_t * );
void module_ResetBank ( vlc_object_t * );
void module_ManageBank ( vlc_object_t * );
#define module_InitBank(a) __module_InitBank(CAST_TO_VLC_OBJECT(a))
void __module_InitBank ( vlc_object_t * );
#define module_LoadMain(a) __module_LoadMain(CAST_TO_VLC_OBJECT(a))
void __module_LoadMain ( vlc_object_t * );
#define module_LoadBuiltins(a) __module_LoadBuiltins(CAST_TO_VLC_OBJECT(a))
void __module_LoadBuiltins ( vlc_object_t * );
#define module_LoadPlugins(a) __module_LoadPlugins(CAST_TO_VLC_OBJECT(a))
void __module_LoadPlugins ( vlc_object_t * );
#define module_EndBank(a) __module_EndBank(CAST_TO_VLC_OBJECT(a))
void __module_EndBank ( vlc_object_t * );
#define module_ResetBank(a) __module_ResetBank(CAST_TO_VLC_OBJECT(a))
void __module_ResetBank ( vlc_object_t * );
#define module_ManageBank(a) __module_ManageBank(CAST_TO_VLC_OBJECT(a))
void __module_ManageBank ( vlc_object_t * );
#define module_Need(a,b,c,d) __module_Need(CAST_TO_VLC_OBJECT(a),b,c,d)
VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, int, char *, void * ) );
VLC_EXPORT( void, module_Unneed, ( module_t * ) );
#define module_Need(a,b,c,d) __module_Need(CAST_TO_VLC_OBJECT(a),b,c,d)
include/netutils.h
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* modules.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.h,v 1.20 2002/06/01 12:31:57 sam Exp $
* $Id: netutils.h,v 1.21 2002/06/01 18:04:48 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Henri Fallon <henri@videolan.org>
......@@ -33,6 +33,8 @@
struct sockaddr_in;
int network_BuildAddr ( struct sockaddr_in *, char *, int );
VLC_EXPORT( int, network_ChannelJoin, ( vlc_object_t *, int ) );
VLC_EXPORT( int, network_ChannelCreate, ( vlc_object_t * ) );
#define network_ChannelJoin(a,b) __network_ChannelJoin(CAST_TO_VLC_OBJECT(a),b)
#define network_ChannelCreate(a) __network_ChannelCreate(CAST_TO_VLC_OBJECT(a))
VLC_EXPORT( int, __network_ChannelJoin, ( vlc_object_t *, int ) );
VLC_EXPORT( int, __network_ChannelCreate, ( vlc_object_t * ) );
include/playlist.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: playlist.h,v 1.3 2002/06/01 12:31:58 sam Exp $
* $Id: playlist.h,v 1.4 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -78,10 +78,9 @@ struct playlist_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
playlist_t * playlist_Create ( vlc_object_t * );
void playlist_Destroy ( playlist_t * );
VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
#define playlist_Create(a) __playlist_Create(CAST_TO_VLC_OBJECT(a))
playlist_t * __playlist_Create ( vlc_object_t * );
void playlist_Destroy ( playlist_t * );
#define playlist_Play(p) playlist_Command(p,PLAYLIST_PLAY,0)
#define playlist_Pause(p) playlist_Command(p,PLAYLIST_PAUSE,0)
......@@ -90,7 +89,9 @@ VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
#define playlist_Prev(p) playlist_Command(p,PLAYLIST_SKIP,-1)
#define playlist_Skip(p,i) playlist_Command(p,PLAYLIST_SKIP,i)
#define playlist_Goto(p,i) playlist_Command(p,PLAYLIST_GOTO,i)
VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
VLC_EXPORT( int, playlist_Add, ( vlc_object_t *, int, const char * ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
#define playlist_Add(a,b,c) __playlist_Add(CAST_TO_VLC_OBJECT(a),b,c)
VLC_EXPORT( int, __playlist_Add, ( vlc_object_t *, int, const char * ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
include/video_output.h
View file @ 71ec135b
......@@ -5,7 +5,7 @@
* thread, and destroy a previously opened video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_output.h,v 1.76 2002/06/01 12:31:58 sam Exp $
* $Id: video_output.h,v 1.77 2002/06/01 18:04:48 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -163,8 +163,9 @@ struct vout_thread_s
/*****************************************************************************
* Prototypes
*****************************************************************************/
VLC_EXPORT( vout_thread_t *, vout_CreateThread, ( vlc_object_t *, int, int, u32, int ) );
VLC_EXPORT( void, vout_DestroyThread, ( vout_thread_t * ) );
#define vout_CreateThread(a,b,c,d,e) __vout_CreateThread(CAST_TO_VLC_OBJECT(a),b,c,d,e)
VLC_EXPORT( vout_thread_t *, __vout_CreateThread, ( vlc_object_t *, int, int, u32, int ) );
VLC_EXPORT( void, vout_DestroyThread, ( vout_thread_t * ) );
vout_fifo_t * vout_CreateFifo ( void );
void vout_DestroyFifo ( vout_fifo_t * );
......
include/vlc_common.h
View file @ 71ec135b
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.2 2002/06/01 14:31:32 sam Exp $
* $Id: vlc_common.h,v 1.3 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -211,6 +211,7 @@ VLC_DECLARE_STRUCT(iso639_lang)
\
/* Thread properties, if any */ \
vlc_bool_t b_thread; \
int i_thread; \
vlc_thread_t thread_id; \
vlc_mutex_t thread_lock; \
vlc_cond_t thread_wait; \
......@@ -219,7 +220,6 @@ VLC_DECLARE_STRUCT(iso639_lang)
volatile vlc_bool_t b_die; /* set by the outside */ \
volatile vlc_bool_t b_dead; /* set by the object */ \
\
vlc_object_t * p_this; /* a pointer to ourselves */ \
vlc_t * p_vlc; /* root of all evil */ \
\
volatile int i_refcount; \
......
include/vlc_cpu.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* cpu.h: CPU type detection
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: vlc_cpu.h,v 1.1 2002/06/01 12:31:58 sam Exp $
* $Id: vlc_cpu.h,v 1.2 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -21,5 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
u32 CPUCapabilities( vlc_object_t * );
#define CPUCapabilities(a) __CPUCapabilities(CAST_TO_VLC_OBJECT(a))
u32 __CPUCapabilities( vlc_object_t * );
include/vlc_messages.h
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: vlc_messages.h,v 1.1 2002/06/01 12:31:58 sam Exp $
* $Id: vlc_messages.h,v 1.2 2002/06/01 18:04:48 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -121,3 +121,13 @@ VLC_EXPORT( void, __msg_Dbg, ( void *, const char *, ... ) );
#endif /* HAVE_VARIADIC_MACROS */
#define msg_Create(a) __msg_Create(CAST_TO_VLC_OBJECT(a))
#define msg_Destroy(a) __msg_Destroy(CAST_TO_VLC_OBJECT(a))
void __msg_Create ( vlc_object_t * );
void __msg_Destroy ( vlc_object_t * );
#define msg_Subscribe(a) __msg_Subscribe(CAST_TO_VLC_OBJECT(a))
#define msg_Unsubscribe(a,b) __msg_Unsubscribe(CAST_TO_VLC_OBJECT(a),b)
VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t * ) );
VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) );
include/vlc_symbols.h
View file @ 71ec135b
......@@ -2,7 +2,7 @@
struct module_symbols_s
{
aout_fifo_t * (* aout_CreateFifo_inner) ( vlc_object_t *, int, int, int, int, void * ) ;
aout_fifo_t * (* __aout_CreateFifo_inner) ( vlc_object_t *, int, int, int, int, void * ) ;
void (* aout_DestroyFifo_inner) ( aout_fifo_t *p_fifo ) ;
int (* __config_GetInt_inner) (vlc_object_t *, const char *) ;
void (* __config_PutInt_inner) (vlc_object_t *, const char *, int) ;
......@@ -10,10 +10,10 @@ struct module_symbols_s
void (* __config_PutFloat_inner) (vlc_object_t *, const char *, float) ;
char * (* __config_GetPsz_inner) (vlc_object_t *, const char *) ;
void (* __config_PutPsz_inner) (vlc_object_t *, const char *, char *) ;
int (* config_LoadCmdLine_inner) ( vlc_object_t *, int *, char *[], vlc_bool_t ) ;
int (* __config_LoadCmdLine_inner) ( vlc_object_t *, int *, char *[], vlc_bool_t ) ;
char * (* config_GetHomeDir_inner) ( void ) ;
int (* config_LoadConfigFile_inner) ( vlc_object_t *, const char * ) ;
int (* config_SaveConfigFile_inner) ( vlc_object_t *, const char * ) ;
int (* __config_LoadConfigFile_inner) ( vlc_object_t *, const char * ) ;
int (* __config_SaveConfigFile_inner) ( vlc_object_t *, const char * ) ;
module_config_t * (* config_FindConfig_inner) ( vlc_object_t *, const char *psz_name ) ;
void (* config_Duplicate_inner) ( module_t *, module_config_t * ) ;
void (* config_SetCallbacks_inner) ( module_config_t *, module_config_t * ) ;
......@@ -52,7 +52,6 @@ struct module_symbols_s
int (* input_ClockManageControl_inner) ( input_thread_t *, pgrm_descriptor_t *, mtime_t ) ;
void (* input_ClockManageRef_inner) ( input_thread_t *, pgrm_descriptor_t *, mtime_t ) ;
mtime_t (* input_ClockGetTS_inner) ( input_thread_t *, pgrm_descriptor_t *, mtime_t ) ;
void * (* input_BuffersInit_inner) ( vlc_object_t * ) ;
void (* input_BuffersEnd_inner) ( input_thread_t *, input_buffers_t * ) ;
data_buffer_t * (* input_NewBuffer_inner) ( input_buffers_t *, size_t ) ;
void (* input_ReleaseBuffer_inner) ( input_buffers_t *, data_buffer_t * ) ;
......@@ -79,9 +78,7 @@ struct module_symbols_s
ssize_t (* input_FDRead_inner) ( input_thread_t *, byte_t *, size_t ) ;
ssize_t (* input_FDNetworkRead_inner) ( input_thread_t *, byte_t *, size_t ) ;
void (* input_FDSeek_inner) ( input_thread_t *, off_t ) ;
msg_subscription_t* (* msg_Subscribe_inner) ( vlc_object_t * ) ;
void (* msg_Unsubscribe_inner) ( vlc_object_t *, msg_subscription_t * ) ;
int (* intf_Eject_inner) ( vlc_object_t *, const char * ) ;
int (* __intf_Eject_inner) ( vlc_object_t *, const char * ) ;
const iso639_lang_t * (* GetLang_1_inner) ( const char * ) ;
const iso639_lang_t * (* GetLang_2T_inner) ( const char * ) ;
const iso639_lang_t * (* GetLang_2B_inner) ( const char * ) ;
......@@ -92,10 +89,10 @@ struct module_symbols_s
mtime_t (* mdate_inner) ( void ) ;
void (* mwait_inner) ( mtime_t date ) ;
void (* msleep_inner) ( mtime_t delay ) ;
int (* network_ChannelJoin_inner) ( vlc_object_t *, int ) ;
int (* network_ChannelCreate_inner) ( vlc_object_t * ) ;
int (* __network_ChannelJoin_inner) ( vlc_object_t *, int ) ;
int (* __network_ChannelCreate_inner) ( vlc_object_t * ) ;
void (* playlist_Command_inner) ( playlist_t *, int, int ) ;
int (* playlist_Add_inner) ( vlc_object_t *, int, const char * ) ;
int (* __playlist_Add_inner) ( vlc_object_t *, int, const char * ) ;
int (* playlist_Delete_inner) ( playlist_t *, int ) ;
int (* __vlc_threads_init_inner) ( vlc_object_t * ) ;
int (* vlc_threads_end_inner) ( void ) ;
......@@ -106,7 +103,7 @@ struct module_symbols_s
int (* __vlc_thread_create_inner) ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), vlc_bool_t ) ;
void (* __vlc_thread_ready_inner) ( vlc_object_t * ) ;
void (* __vlc_thread_join_inner) ( vlc_object_t *, char *, int ) ;
vout_thread_t * (* vout_CreateThread_inner) ( vlc_object_t *, int, int, u32, int ) ;
vout_thread_t * (* __vout_CreateThread_inner) ( vlc_object_t *, int, int, u32, int ) ;
void (* vout_DestroyThread_inner) ( vout_thread_t * ) ;
int (* vout_ChromaCmp_inner) ( u32, u32 ) ;
picture_t * (* vout_CreatePicture_inner) ( vout_thread_t *, vlc_bool_t, vlc_bool_t, vlc_bool_t ) ;
......@@ -125,6 +122,8 @@ struct module_symbols_s
void (* __msg_Err_inner) ( void *, const char *, ... ) ;
void (* __msg_Warn_inner) ( void *, const char *, ... ) ;
void (* __msg_Dbg_inner) ( void *, const char *, ... ) ;
msg_subscription_t* (* __msg_Subscribe_inner) ( vlc_object_t * ) ;
void (* __msg_Unsubscribe_inner) ( vlc_object_t *, msg_subscription_t * ) ;
void * (* __vlc_object_create_inner) ( vlc_object_t *, int ) ;
void (* __vlc_object_destroy_inner) ( vlc_object_t * ) ;
void * (* __vlc_object_find_inner) ( vlc_object_t *, int, int ) ;
......@@ -137,7 +136,7 @@ struct module_symbols_s
};
#ifdef __PLUGIN__
# define aout_CreateFifo p_symbols->aout_CreateFifo_inner
# define __aout_CreateFifo p_symbols->__aout_CreateFifo_inner
# define aout_DestroyFifo p_symbols->aout_DestroyFifo_inner
# define __config_GetInt p_symbols->__config_GetInt_inner
# define __config_PutInt p_symbols->__config_PutInt_inner
......@@ -145,10 +144,10 @@ struct module_symbols_s
# define __config_PutFloat p_symbols->__config_PutFloat_inner
# define __config_GetPsz p_symbols->__config_GetPsz_inner
# define __config_PutPsz p_symbols->__config_PutPsz_inner
# define config_LoadCmdLine p_symbols->config_LoadCmdLine_inner
# define __config_LoadCmdLine p_symbols->__config_LoadCmdLine_inner
# define config_GetHomeDir p_symbols->config_GetHomeDir_inner
# define config_LoadConfigFile p_symbols->config_LoadConfigFile_inner
# define config_SaveConfigFile p_symbols->config_SaveConfigFile_inner
# define __config_LoadConfigFile p_symbols->__config_LoadConfigFile_inner
# define __config_SaveConfigFile p_symbols->__config_SaveConfigFile_inner
# define config_FindConfig p_symbols->config_FindConfig_inner
# define config_Duplicate p_symbols->config_Duplicate_inner
# define config_SetCallbacks p_symbols->config_SetCallbacks_inner
......@@ -187,7 +186,6 @@ struct module_symbols_s
# define input_ClockManageControl p_symbols->input_ClockManageControl_inner
# define input_ClockManageRef p_symbols->input_ClockManageRef_inner
# define input_ClockGetTS p_symbols->input_ClockGetTS_inner
# define input_BuffersInit p_symbols->input_BuffersInit_inner
# define input_BuffersEnd p_symbols->input_BuffersEnd_inner
# define input_NewBuffer p_symbols->input_NewBuffer_inner
# define input_ReleaseBuffer p_symbols->input_ReleaseBuffer_inner
......@@ -214,9 +212,7 @@ struct module_symbols_s
# define input_FDRead p_symbols->input_FDRead_inner
# define input_FDNetworkRead p_symbols->input_FDNetworkRead_inner
# define input_FDSeek p_symbols->input_FDSeek_inner
# define msg_Subscribe p_symbols->msg_Subscribe_inner
# define msg_Unsubscribe p_symbols->msg_Unsubscribe_inner
# define intf_Eject p_symbols->intf_Eject_inner
# define __intf_Eject p_symbols->__intf_Eject_inner
# define GetLang_1 p_symbols->GetLang_1_inner
# define GetLang_2T p_symbols->GetLang_2T_inner
# define GetLang_2B p_symbols->GetLang_2B_inner
......@@ -227,10 +223,10 @@ struct module_symbols_s
# define mdate p_symbols->mdate_inner
# define mwait p_symbols->mwait_inner
# define msleep p_symbols->msleep_inner
# define network_ChannelJoin p_symbols->network_ChannelJoin_inner
# define network_ChannelCreate p_symbols->network_ChannelCreate_inner
# define __network_ChannelJoin p_symbols->__network_ChannelJoin_inner
# define __network_ChannelCreate p_symbols->__network_ChannelCreate_inner
# define playlist_Command p_symbols->playlist_Command_inner
# define playlist_Add p_symbols->playlist_Add_inner
# define __playlist_Add p_symbols->__playlist_Add_inner
# define playlist_Delete p_symbols->playlist_Delete_inner
# define __vlc_threads_init p_symbols->__vlc_threads_init_inner
# define vlc_threads_end p_symbols->vlc_threads_end_inner
......@@ -241,7 +237,7 @@ struct module_symbols_s
# define __vlc_thread_create p_symbols->__vlc_thread_create_inner
# define __vlc_thread_ready p_symbols->__vlc_thread_ready_inner
# define __vlc_thread_join p_symbols->__vlc_thread_join_inner
# define vout_CreateThread p_symbols->vout_CreateThread_inner
# define __vout_CreateThread p_symbols->__vout_CreateThread_inner
# define vout_DestroyThread p_symbols->vout_DestroyThread_inner
# define vout_ChromaCmp p_symbols->vout_ChromaCmp_inner
# define vout_CreatePicture p_symbols->vout_CreatePicture_inner
......@@ -260,6 +256,8 @@ struct module_symbols_s
# define __msg_Err p_symbols->__msg_Err_inner
# define __msg_Warn p_symbols->__msg_Warn_inner
# define __msg_Dbg p_symbols->__msg_Dbg_inner
# define __msg_Subscribe p_symbols->__msg_Subscribe_inner
# define __msg_Unsubscribe p_symbols->__msg_Unsubscribe_inner
# define __vlc_object_create p_symbols->__vlc_object_create_inner
# define __vlc_object_destroy p_symbols->__vlc_object_destroy_inner
# define __vlc_object_find p_symbols->__vlc_object_find_inner
......
plugins/a52/a52.c
View file @ 71ec135b
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: a52.c,v 1.17 2002/06/01 16:45:34 sam Exp $
* $Id: a52.c,v 1.18 2002/06/01 18:04:48 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -236,7 +236,7 @@ static int DecodeFrame( a52_adec_thread_t * p_a52_adec )
/* Creating the audio output fifo if not created yet */
if( p_a52_adec->p_aout_fifo == NULL )
{
p_a52_adec->p_aout_fifo = aout_CreateFifo( p_a52_adec->p_fifo->p_this,
p_a52_adec->p_aout_fifo = aout_CreateFifo( p_a52_adec->p_fifo,
AOUT_FIFO_PCM, p_a52_adec->i_channels,
p_a52_adec->sample_rate,
AC3DEC_FRAME_SIZE * p_a52_adec->i_channels,
......
plugins/ac3_adec/ac3_adec.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* ac3_adec.c: ac3 decoder module main file
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ac3_adec.c,v 1.32 2002/06/01 12:31:58 sam Exp $
* $Id: ac3_adec.c,v 1.33 2002/06/01 18:04:48 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
*
......@@ -185,7 +185,7 @@ static int decoder_Run ( decoder_fifo_t * p_fifo )
/* Creating the audio output fifo if not created yet */
if (p_ac3dec->p_aout_fifo == NULL ) {
p_ac3dec->p_aout_fifo =
aout_CreateFifo( p_ac3dec->p_fifo->p_this, AOUT_FIFO_PCM, 2,
aout_CreateFifo( p_ac3dec->p_fifo, AOUT_FIFO_PCM, 2,
sync_info.sample_rate, AC3DEC_FRAME_SIZE, NULL );
if ( p_ac3dec->p_aout_fifo == NULL )
{
......
plugins/ac3_spdif/ac3_spdif.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ac3_spdif.c,v 1.27 2002/06/01 12:31:58 sam Exp $
* $Id: ac3_spdif.c,v 1.28 2002/06/01 18:04:48 sam Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
......@@ -315,7 +315,7 @@ static int InitThread( ac3_spdif_thread_t * p_spdif )
/* Creating the audio output fifo */
p_spdif->p_aout_fifo =
aout_CreateFifo( p_spdif->p_fifo->p_this, AOUT_FIFO_SPDIF,
aout_CreateFifo( p_spdif->p_fifo, AOUT_FIFO_SPDIF,
1, p_spdif->ac3_info.i_sample_rate,
p_spdif->ac3_info.i_frame_size, NULL );
......
plugins/directx/vout_events.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* vout_events.c: Windows DirectX video output events handler
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vout_events.c,v 1.20 2002/06/01 16:45:34 sam Exp $
* $Id: vout_events.c,v 1.21 2002/06/01 18:04:48 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -186,16 +186,16 @@ void DirectXEventThread( event_thread_t *p_event )
p_event->p_vout->p_sys->i_changes |= VOUT_INTF_CHANGE;
break;
case '0': network_ChannelJoin( p_event->p_this, 0 ); break;
case '1': network_ChannelJoin( p_event->p_this, 1 ); break;
case '2': network_ChannelJoin( p_event->p_this, 2 ); break;
case '3': network_ChannelJoin( p_event->p_this, 3 ); break;
case '4': network_ChannelJoin( p_event->p_this, 4 ); break;
case '5': network_ChannelJoin( p_event->p_this, 5 ); break;
case '6': network_ChannelJoin( p_event->p_this, 6 ); break;
case '7': network_ChannelJoin( p_event->p_this, 7 ); break;
case '8': network_ChannelJoin( p_event->p_this, 8 ); break;
case '9': network_ChannelJoin( p_event->p_this, 9 ); break;
case '0': network_ChannelJoin( p_event, 0 ); break;
case '1': network_ChannelJoin( p_event, 1 ); break;
case '2': network_ChannelJoin( p_event, 2 ); break;
case '3': network_ChannelJoin( p_event, 3 ); break;
case '4': network_ChannelJoin( p_event, 4 ); break;
case '5': network_ChannelJoin( p_event, 5 ); break;
case '6': network_ChannelJoin( p_event, 6 ); break;
case '7': network_ChannelJoin( p_event, 7 ); break;
case '8': network_ChannelJoin( p_event, 8 ); break;
case '9': network_ChannelJoin( p_event, 9 ); break;
default:
break;
......
plugins/ffmpeg/ffmpeg.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.11 2002/06/01 12:31:59 sam Exp $
* $Id: ffmpeg.c,v 1.12 2002/06/01 18:04:48 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -376,7 +376,7 @@ static int InitThread( videodec_thread_t *p_vdec )
}
/* create vout */
p_vdec->p_vout = vout_CreateThread( p_vdec->p_fifo->p_this,
p_vdec->p_vout = vout_CreateThread( p_vdec->p_fifo,
p_vdec->format.i_width,
p_vdec->format.i_height,
FOURCC_I420,
......
plugins/filter/clone.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: clone.c,v 1.5 2002/06/01 12:31:59 sam Exp $
* $Id: clone.c,v 1.6 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -163,7 +163,7 @@ static int vout_Init( vout_thread_t *p_vout )
for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ )
{
p_vout->p_sys->pp_vout[ i_vout ] =
vout_CreateThread( p_vout->p_this,
vout_CreateThread( p_vout,
p_vout->render.i_width, p_vout->render.i_height,
p_vout->render.i_chroma, p_vout->render.i_aspect );
if( p_vout->p_sys->pp_vout[ i_vout ] == NULL )
......
plugins/filter/deinterlace.c
View file @ 71ec135b
......@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: deinterlace.c,v 1.13 2002/06/01 12:31:59 sam Exp $
* $Id: deinterlace.c,v 1.14 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -201,14 +201,14 @@ static int vout_Init( vout_thread_t *p_vout )
{
case DEINTERLACE_MODE_BOB:
p_vout->p_sys->p_vout =
vout_CreateThread( p_vout->p_this,
vout_CreateThread( p_vout,
p_vout->output.i_width, p_vout->output.i_height / 2,
p_vout->output.i_chroma, p_vout->output.i_aspect );
break;
case DEINTERLACE_MODE_BLEND:
p_vout->p_sys->p_vout =
vout_CreateThread( p_vout->p_this,
vout_CreateThread( p_vout,
p_vout->output.i_width, p_vout->output.i_height,
p_vout->output.i_chroma, p_vout->output.i_aspect );
break;
......@@ -217,7 +217,7 @@ static int vout_Init( vout_thread_t *p_vout )
case FOURCC_I422: