mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-12-13 11:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Hocevar 2002-06-01 18:04:49 +00:00
parent 3722c40b96
commit 71ec135b95
70 changed files with 326 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/audio_output.h
View File

@ -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 );

14
include/configuration.h
View File

@ -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.
*

7
include/input_ext-intf.h
View File

@ -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 * );

8
include/input_ext-plugins.h
View File

@ -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 * ) );

17
include/interface.h
View File

@ -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 * );

5
include/intf_eject.h
View File

@ -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 * ) );

26
include/modules.h
View File

@ -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)

8
include/netutils.h
View File

@ -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 * ) );

15
include/playlist.h
View File

@ -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 ) );

7
include/video_output.h
View File

@ -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 * );

4
include/vlc_common.h
View File

@ -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; \

5
include/vlc_cpu.h
View File

@ -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 * );

12
include/vlc_messages.h
View File

@ -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 * ) );

46
include/vlc_symbols.h
View File

@ -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

4
plugins/a52/a52.c
View File

@ -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,

4
plugins/ac3_adec/ac3_adec.c
View File

@ -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 )
{

4
plugins/ac3_spdif/ac3_spdif.c
View File

@ -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: Stéphane 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 );

22
plugins/directx/vout_events.c
View File

@ -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;

4
plugins/ffmpeg/ffmpeg.c
View File

@ -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,

4
plugins/filter/clone.c
View File

@ -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 )

8
plugins/filter/deinterlace.c
View File

@ -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:
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,
FOURCC_I420, p_vout->output.i_aspect );
break;

4
plugins/filter/distort.c
View File

@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: distort.c,v 1.14 2002/06/01 12:31:59 sam Exp $
* $Id: distort.c,v 1.15 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -208,7 +208,7 @@ static int vout_Init( vout_thread_t *p_vout )
msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_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 );

4
plugins/filter/invert.c
View File

@ -2,7 +2,7 @@
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: invert.c,v 1.12 2002/06/01 12:31:59 sam Exp $
* $Id: invert.c,v 1.13 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -138,7 +138,7 @@ static int vout_Init( vout_thread_t *p_vout )
msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_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 );

6
plugins/filter/transform.c
View File

@ -2,7 +2,7 @@
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: transform.c,v 1.13 2002/06/01 12:31:59 sam Exp $
* $Id: transform.c,v 1.14 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -200,7 +200,7 @@ static int vout_Init( vout_thread_t *p_vout )
if( p_vout->p_sys->b_rotation )
{
p_vout->p_sys->p_vout =
vout_CreateThread( p_vout->p_this,
vout_CreateThread( p_vout,
p_vout->render.i_height, p_vout->render.i_width,
p_vout->render.i_chroma,
(u64)VOUT_ASPECT_FACTOR * (u64)VOUT_ASPECT_FACTOR
@ -209,7 +209,7 @@ static int vout_Init( vout_thread_t *p_vout )
else
{
p_vout->p_sys->p_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 );
}

4
plugins/filter/wall.c
View File

@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: wall.c,v 1.21 2002/06/01 12:31:59 sam Exp $
* $Id: wall.c,v 1.22 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -271,7 +271,7 @@ static int vout_Init( vout_thread_t *p_vout )
}
p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout =
vout_CreateThread( p_vout->p_this, i_width, i_height,
vout_CreateThread( p_vout, i_width, i_height,
p_vout->render.i_chroma,
p_vout->render.i_aspect
* p_vout->render.i_height / i_height

4
plugins/fx/scope.c
View File

@ -2,7 +2,7 @@
* scope.c : Scope effect module
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: scope.c,v 1.7 2002/06/01 12:31:59 sam Exp $
* $Id: scope.c,v 1.8 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -125,7 +125,7 @@ static int aout_Open( aout_thread_t *p_aout )
/* Open video output */
p_aout->p_sys->p_vout =
vout_CreateThread( p_aout->p_this, SCOPE_WIDTH, SCOPE_HEIGHT,
vout_CreateThread( p_aout, SCOPE_WIDTH, SCOPE_HEIGHT,
FOURCC_I420, SCOPE_ASPECT );
if( p_aout->p_sys->p_vout == NULL )

6
plugins/gtk/gnome.c
View File

@ -2,7 +2,7 @@
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: gnome.c,v 1.24 2002/06/01 12:31:59 sam Exp $
* $Id: gnome.c,v 1.25 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -156,7 +156,7 @@ static int intf_Open( intf_thread_t *p_intf )
return( 1 );
}
p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_this );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
/* Initialize Gnome thread */
p_intf->p_sys->b_playing = 0;
@ -180,7 +180,7 @@ static int intf_Open( intf_thread_t *p_intf )
*****************************************************************************/
static void intf_Close( intf_thread_t *p_intf )
{
msg_Unsubscribe( p_intf->p_this, p_intf->p_sys->p_sub );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
/* Destroy structure */
free( p_intf->p_sys );

6
plugins/gtk/gtk.c
View File

@ -2,7 +2,7 @@
* gtk.c : Gtk+ plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: gtk.c,v 1.24 2002/06/01 12:31:59 sam Exp $
* $Id: gtk.c,v 1.25 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -150,7 +150,7 @@ static int intf_Open( intf_thread_t *p_intf )
return( 1 );
}
p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_this );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
/* Initialize Gtk+ thread */
p_intf->p_sys->b_playing = 0;
@ -174,7 +174,7 @@ static int intf_Open( intf_thread_t *p_intf )
*****************************************************************************/
static void intf_Close( intf_thread_t *p_intf )
{
msg_Unsubscribe( p_intf->p_this, p_intf->p_sys->p_sub );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
/* Destroy structure */
free( p_intf->p_sys );

6
plugins/gtk/gtk_callbacks.c
View File

@ -2,7 +2,7 @@
* gtk_callbacks.c : Callbacks for the Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_callbacks.c,v 1.40 2002/06/01 12:31:59 sam Exp $
* $Id: gtk_callbacks.c,v 1.41 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
@ -319,7 +319,7 @@ void GtkChannelGo( GtkButton * button, gpointer user_data )
#endif
}
network_ChannelJoin( p_intf->p_this, i_channel );
network_ChannelJoin( p_intf, i_channel );
/* FIXME 2 */
#if 0 /* PLAYLIST TARASS */
@ -536,7 +536,7 @@ gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
{
msg_Dbg( p_intf, "ejecting %s", psz_device );
intf_Eject( p_intf->p_this, psz_device );
intf_Eject( p_intf, psz_device );
}
free(psz_device);

16
plugins/gtk/gtk_open.c
View File

@ -2,7 +2,7 @@
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_open.c,v 1.25 2002/06/01 12:31:59 sam Exp $
* $Id: gtk_open.c,v 1.26 2002/06/01 18:04:48 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
@ -107,7 +107,7 @@ void GtkFileOpenOk( GtkButton * button, gpointer user_data )
/* add the new file to the interface playlist */
psz_filename =
gtk_file_selection_get_filename( GTK_FILE_SELECTION( p_filesel ) );
playlist_Add( p_playlist->p_this, 0, (char*)psz_filename );
playlist_Add( p_playlist, 0, (char*)psz_filename );
/* catch the GTK CList */
p_playlist_clist = GTK_CLIST( gtk_object_get_data(
@ -241,7 +241,7 @@ void GtkDiscOpenOk( GtkButton * button, gpointer user_data )
/* Build source name and add it to playlist */
sprintf( psz_source, "%s:%s@%d,%d",
psz_method, psz_device, i_title, i_chapter );
playlist_Add( p_playlist->p_this, 0, psz_source );
playlist_Add( p_playlist, 0, psz_source );
free( psz_source );
/* catch the GTK CList */
@ -378,7 +378,7 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
/* Build source name and add it to playlist */
sprintf( psz_source, "udp:@:%i", i_port );
playlist_Add( p_playlist->p_this, 0, psz_source );
playlist_Add( p_playlist, 0, psz_source );
free( psz_source );
/* catch the GTK CList */
@ -421,7 +421,7 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
/* Build source name and add it to playlist */
sprintf( psz_source, "udp:@%s:%i", psz_address, i_port );
playlist_Add( p_playlist->p_this, 0, psz_source );
playlist_Add( p_playlist, 0, psz_source );
free( psz_source );
/* catch the GTK CList */
@ -444,7 +444,7 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
if( p_intf->p_vlc->p_channel == NULL )
{
network_ChannelCreate( p_intf->p_this );
network_ChannelCreate( p_intf );
}
psz_channel = gtk_entry_get_text( GTK_ENTRY( lookup_widget(
@ -480,7 +480,7 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
/* Build source name and add it to playlist */
sprintf( psz_source, "http://%s", psz_address );
playlist_Add( p_playlist->p_this, 0, psz_source );
playlist_Add( p_playlist, 0, psz_source );
free( psz_source );
/* catch the GTK CList */
@ -666,7 +666,7 @@ void GtkSatOpenOk( GtkButton * button, gpointer user_data )
/* Build source name and add it to playlist */
sprintf( psz_source, "%s:%d,%d,%d,%d",
"satellite", i_freq, b_pol, i_fec, i_srate );
playlist_Add( p_playlist->p_this, 0, psz_source );
playlist_Add( p_playlist, 0, psz_source );
free( psz_source );
/* catch the GTK CList */

4
plugins/gtk/gtk_preferences.c
View File

@ -2,7 +2,7 @@
* gtk_preferences.c: functions to handle the preferences dialog box.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_preferences.c,v 1.30 2002/06/01 12:31:59 sam Exp $
* $Id: gtk_preferences.c,v 1.31 2002/06/01 18:04:48 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Loïc Minier <lool@via.ecp.fr>
@ -616,7 +616,7 @@ void GtkConfigSave( GtkButton * button, gpointer user_data )
p_intf = (intf_thread_t *)gtk_object_get_data( GTK_OBJECT(user_data),
"p_intf" );
GtkConfigApply( button, user_data );
config_SaveConfigFile( p_intf->p_this, NULL );
config_SaveConfigFile( p_intf, NULL );
}
/****************************************************************************

2
plugins/kde/kde_preferences.cpp
View File

@ -274,5 +274,5 @@ void KPreferences::slotOk()
void KPreferences::slotUser1()
{
slotApply();
config_SaveConfigFile( p_intf->p_this, NULL );
config_SaveConfigFile( p_intf, NULL );
}

4
plugins/lpcm_adec/lpcm_adec.c
View File

@ -2,7 +2,7 @@
* lpcm_adec.c: lpcm decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: lpcm_adec.c,v 1.16 2002/06/01 12:32:00 sam Exp $
* $Id: lpcm_adec.c,v 1.17 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org>
@ -141,7 +141,7 @@ static int InitThread (lpcmdec_thread_t * p_lpcmdec)
/* Creating the audio output fifo */
p_lpcmdec->p_aout_fifo =
aout_CreateFifo( p_lpcmdec->p_fifo->p_this, AOUT_FIFO_PCM,
aout_CreateFifo( p_lpcmdec->p_fifo, AOUT_FIFO_PCM,
2, 48000, LPCMDEC_FRAME_SIZE / 2, NULL );
if ( p_lpcmdec->p_aout_fifo == NULL )
{

2
plugins/mad/mad_libmad.c
View File

@ -288,7 +288,7 @@ enum mad_flow libmad_output(void *data, struct mad_header const *p_libmad_header
if (p_mad_adec->p_aout_fifo==NULL)
{
p_mad_adec->p_aout_fifo = aout_CreateFifo(
p_mad_adec->p_fifo->p_this,
p_mad_adec->p_fifo,
AOUT_FIFO_PCM, /* fifo type */
2, /*p_libmad_pcm->channels,*/ /* nr. of channels */
p_libmad_pcm->samplerate, /* frame rate in Hz ?*/

5
plugins/mpeg_adec/mpeg_adec.c
View File

@ -2,7 +2,7 @@
* mpeg_adec.c: MPEG audio decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: mpeg_adec.c,v 1.24 2002/06/01 12:32:00 sam Exp $
* $Id: mpeg_adec.c,v 1.25 2002/06/01 18:04:49 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
@ -178,8 +178,7 @@ static void DecodeThread( adec_thread_t * p_adec )
i_channels = 1;
}
p_adec->p_aout_fifo =
aout_CreateFifo( p_adec->p_fifo->p_this,
AOUT_FIFO_PCM, i_channels,
aout_CreateFifo( p_adec->p_fifo, AOUT_FIFO_PCM, i_channels,
sync_info.sample_rate, ADEC_FRAME_SIZE, NULL );
if( p_adec->p_aout_fifo == NULL)
{

4
plugins/mpeg_vdec/vpar_headers.c
View File

@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vpar_headers.c,v 1.24 2002/06/01 13:52:24 sam Exp $
* $Id: vpar_headers.c,v 1.25 2002/06/01 18:04:49 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stéphane Borel <stef@via.ecp.fr>
@ -517,7 +517,7 @@ static void SequenceHeader( vpar_thread_t * p_vpar )
{
msg_Dbg( p_vpar->p_fifo, "no vout present, spawning one" );
p_vpar->p_vout = vout_CreateThread( p_vpar->p_fifo->p_this,
p_vpar->p_vout = vout_CreateThread( p_vpar->p_fifo,
p_vpar->sequence.i_width,
p_vpar->sequence.i_height,
ChromaToFourCC( p_vpar->sequence.i_chroma_format ),

8
plugins/mpeg_vdec/vpar_synchro.c
View File

@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: vpar_synchro.c,v 1.11 2002/06/01 13:52:24 sam Exp $
* $Id: vpar_synchro.c,v 1.12 2002/06/01 18:04:49 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
@ -109,7 +109,7 @@
/*
* Local prototypes
*/
static int SynchroType( vlc_object_t * );
static int SynchroType( decoder_fifo_t * );
/* Error margins */
#define DELTA (int)(0.075*CLOCK_FREQ)
@ -122,7 +122,7 @@ static int SynchroType( vlc_object_t * );
*****************************************************************************/
void vpar_SynchroInit( vpar_thread_t * p_vpar )
{
p_vpar->synchro.i_type = SynchroType( p_vpar->p_fifo->p_this );
p_vpar->synchro.i_type = SynchroType( p_vpar->p_fifo );
/* We use a fake stream pattern, which is often right. */
p_vpar->synchro.i_n_p = p_vpar->synchro.i_eta_p = DEFAULT_NB_P;
@ -527,7 +527,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
*****************************************************************************
* This function is called at initialization.
*****************************************************************************/
static int SynchroType( vlc_object_t *p_this )
static int SynchroType( decoder_fifo_t *p_this )
{
char psz_synchro_tmp[5];
char * psz_synchro = config_GetPsz( p_this, "vpar-synchro" );

22
plugins/sdl/vout_sdl.c
View File

@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: vout_sdl.c,v 1.92 2002/06/01 12:32:00 sam Exp $
* $Id: vout_sdl.c,v 1.93 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
@ -451,16 +451,16 @@ static int vout_Manage( vout_thread_t *p_vout )
input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case SDLK_F10: network_ChannelJoin( p_vout->p_this, 0 ); break;
case SDLK_F1: network_ChannelJoin( p_vout->p_this, 1 ); break;
case SDLK_F2: network_ChannelJoin( p_vout->p_this, 2 ); break;
case SDLK_F3: network_ChannelJoin( p_vout->p_this, 3 ); break;
case SDLK_F4: network_ChannelJoin( p_vout->p_this, 4 ); break;
case SDLK_F5: network_ChannelJoin( p_vout->p_this, 5 ); break;
case SDLK_F6: network_ChannelJoin( p_vout->p_this, 6 ); break;
case SDLK_F7: network_ChannelJoin( p_vout->p_this, 7 ); break;
case SDLK_F8: network_ChannelJoin( p_vout->p_this, 8 ); break;
case SDLK_F9: network_ChannelJoin( p_vout->p_this, 9 ); break;
case SDLK_F10: network_ChannelJoin( p_vout, 0 ); break;
case SDLK_F1: network_ChannelJoin( p_vout, 1 ); break;
case SDLK_F2: network_ChannelJoin( p_vout, 2 ); break;
case SDLK_F3: network_ChannelJoin( p_vout, 3 ); break;
case SDLK_F4: network_ChannelJoin( p_vout, 4 ); break;
case SDLK_F5: network_ChannelJoin( p_vout, 5 ); break;
case SDLK_F6: network_ChannelJoin( p_vout, 6 ); break;
case SDLK_F7: network_ChannelJoin( p_vout, 7 ); break;
case SDLK_F8: network_ChannelJoin( p_vout, 8 ); break;
case SDLK_F9: network_ChannelJoin( p_vout, 9 ); break;
default:
break;

8
plugins/text/logger.c
View File

@ -2,7 +2,7 @@
* logger.c : file logging plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: logger.c,v 1.10 2002/06/01 12:32:00 sam Exp $
* $Id: logger.c,v 1.11 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -182,13 +182,13 @@ static int intf_Open( intf_thread_t *p_intf )
p_intf->p_sys->p_file = fopen( psz_file, "wt" );
setvbuf( p_intf->p_sys->p_file, NULL, _IONBF, 0 );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_this );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
if( p_intf->p_sys->p_file == NULL )
{
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
free( p_intf->p_sys );
msg_Unsubscribe( p_intf->p_this, p_intf->p_sys->p_sub );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
free( psz_file );
return -1;
}
@ -217,7 +217,7 @@ static void intf_Close( intf_thread_t *p_intf )
/* Flush the queue and unsubscribe from the message queue */
FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
p_intf->p_sys->i_mode );
msg_Unsubscribe( p_intf->p_this, p_intf->p_sys->p_sub );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
switch( p_intf->p_sys->i_mode )
{

4
plugins/text/ncurses.c
View File

@ -2,7 +2,7 @@
* ncurses.c : NCurses plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ncurses.c,v 1.16 2002/06/01 12:32:00 sam Exp $
* $Id: ncurses.c,v 1.17 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -426,7 +426,7 @@ static void Eject ( intf_thread_t *p_intf )
{
//X msg_Dbg( p_input, "ejecting %s", psz_device );
intf_Eject( p_intf->p_this, psz_device );
intf_Eject( p_intf, psz_device );
}
free(psz_device);

4
plugins/text/rc.c
View File

@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: rc.c,v 1.15 2002/06/01 12:32:00 sam Exp $
* $Id: rc.c,v 1.16 2002/06/01 18:04:49 sam Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
@ -222,7 +222,7 @@ static void intf_Run( intf_thread_t *p_intf )
case 'A':
if( p_cmd[1] == ' ' )
{
// playlist_Add( p_intf->p_this, PLAYLIST_END, p_cmd + 2 );
// playlist_Add( p_intf, PLAYLIST_END, p_cmd + 2 );
// playlist_Jumpto( p_intf->p_vlc->p_playlist,
// p_intf->p_vlc->p_playlist->i_size-2 );
}

4
plugins/win32/intf_win32.cpp
View File

@ -72,7 +72,7 @@ static int intf_Open( intf_thread_t *p_intf )
p_intfGlobal = p_intf;
p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_this );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
/* Initialize Win32 thread */
p_intf->p_sys->b_playing = 0;
@ -88,7 +88,7 @@ static int intf_Open( intf_thread_t *p_intf )
*****************************************************************************/
static void intf_Close( intf_thread_t *p_intf )
{
msg_Unsubscribe( p_intf->p_this, p_intf->p_sys->p_sub );
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
/* Destroy structure */
free( p_intf->p_sys );

2
plugins/win32/mainframe.cpp
View File

@ -555,7 +555,7 @@ void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )
p_intf->pf_manage( p_intf );
}
network_ChannelJoin( p_intf->p_this, i_channel );
network_ChannelJoin( p_intf, i_channel );
/* FIXME 2 */
p_intf->p_vlc->p_playlist->b_stopped = 0;

2
plugins/win32/preferences.cpp
View File

@ -529,7 +529,7 @@ void __fastcall TPreferencesDlg::ButtonApplyClick( TObject *Sender )
void __fastcall TPreferencesDlg::ButtonSaveClick( TObject *Sender )
{
ButtonApplyClick( Sender );
config_SaveConfigFile( p_intfGlobal->p_this, NULL );
config_SaveConfigFile( p_intfGlobal, NULL );
}
//---------------------------------------------------------------------------
void __fastcall TPreferencesDlg::ButtonCancelClick( TObject *Sender )

22
plugins/x11/xcommon.c
View File

@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.36 2002/06/01 12:32:00 sam Exp $
* $Id: xcommon.c,v 1.37 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -698,16 +698,16 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
break;
case '0': network_ChannelJoin(p_vout->p_this,0); break;
case '1': network_ChannelJoin(p_vout->p_this,1); break;
case '2': network_ChannelJoin(p_vout->p_this,2); break;
case '3': network_ChannelJoin(p_vout->p_this,3); break;
case '4': network_ChannelJoin(p_vout->p_this,4); break;
case '5': network_ChannelJoin(p_vout->p_this,5); break;
case '6': network_ChannelJoin(p_vout->p_this,6); break;
case '7': network_ChannelJoin(p_vout->p_this,7); break;
case '8': network_ChannelJoin(p_vout->p_this,8); break;
case '9': network_ChannelJoin(p_vout->p_this,9); break;
case '0': network_ChannelJoin( p_vout, 0 ); break;
case '1': network_ChannelJoin( p_vout, 1 ); break;
case '2': network_ChannelJoin( p_vout, 2 ); break;
case '3': network_ChannelJoin( p_vout, 3 ); break;
case '4': network_ChannelJoin( p_vout, 4 ); break;
case '5': network_ChannelJoin( p_vout, 5 ); break;
case '6': network_ChannelJoin( p_vout, 6 ); break;
case '7': network_ChannelJoin( p_vout, 7 ); break;
case '8': network_ChannelJoin( p_vout, 8 ); break;
case '9': network_ChannelJoin( p_vout, 9 ); break;
default:
break;

2
po/de.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc 0.73.3\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-04-18 23:38+0100\n"
"Last-Translator: Thomas Graf <tgr@reeler.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/en_GB.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/fr.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/ja.po
View File

@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-04-02 03:22+0900\n"
"Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/nl.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-04-20 16:58GMT\n"
"Last-Translator: Jean-Paul Saman <jpsaman@wxs.nl>\n"
"Language-Team: Nederlands <nl@li.org>\n"

2
po/no.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc-cvs\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-28-02 23.35+0100\n"
"Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

2
po/pl.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2002-05-26 18:31+0200\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: polish <pl@li.org>\n"

2
po/ru.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-vlc\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: 2001-02-19 19:58+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"

2
po/vlc.pot
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-01 19:02+0200\n"
"POT-Creation-Date: 2002-06-01 19:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

8
src/audio_output/aout_ext-dec.c
View File

@ -2,7 +2,7 @@
* aout_ext-dec.c : exported fifo management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: aout_ext-dec.c,v 1.16 2002/06/01 12:32:01 sam Exp $
* $Id: aout_ext-dec.c,v 1.17 2002/06/01 18:04:49 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
@ -35,9 +35,9 @@
/*****************************************************************************
* aout_CreateFifo
*****************************************************************************/
aout_fifo_t * aout_CreateFifo( vlc_object_t *p_this, int i_format,
int i_channels, int i_rate, int i_frame_size,
void *p_buffer )
aout_fifo_t * __aout_CreateFifo( vlc_object_t *p_this, int i_format,
int i_channels, int i_rate, int i_frame_size,
void *p_buffer )
{
aout_thread_t *p_aout;
aout_fifo_t *p_fifo = NULL;

6
src/input/input.c
View File

@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.198 2002/06/01 12:32:01 sam Exp $
* $Id: input.c,v 1.199 2002/06/01 18:04:49 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
@ -68,8 +68,8 @@ static void EndThread ( input_thread_t *p_input );
* If pi_status is NULL, then the function will block until the thread is ready.
* If not, it will be updated using one of the THREAD_* constants.
*****************************************************************************/
input_thread_t *input_CreateThread ( vlc_object_t *p_parent,
playlist_item_t *p_item, int *pi_status )
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
playlist_item_t *p_item, int *pi_status )
{
input_thread_t * p_input; /* thread descriptor */

6
src/input/input_ext-plugins.c
View File

@ -2,7 +2,7 @@
* input_ext-plugins.c: useful functions for access and demux plug-ins
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: input_ext-plugins.c,v 1.11 2002/06/01 12:32:01 sam Exp $
* $Id: input_ext-plugins.c,v 1.12 2002/06/01 18:04:49 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
@ -126,7 +126,7 @@ struct input_buffers_s
/*****************************************************************************
* input_BuffersInit: initialize the cache structures, return a pointer to it
*****************************************************************************/
void * input_BuffersInit( vlc_object_t *p_this )
void * __input_BuffersInit( vlc_object_t *p_this )
{
input_buffers_t * p_buffers = malloc( sizeof( input_buffers_t ) );
@ -619,7 +619,7 @@ ssize_t input_SplitBuffer( input_thread_t * p_input,
*****************************************************************************/
int input_AccessInit( input_thread_t * p_input )
{
p_input->p_method_data = input_BuffersInit( p_input->p_this );
p_input->p_method_data = input_BuffersInit( p_input );
if( p_input->p_method_data == NULL ) return( -1 );
p_input->p_data_buffer = NULL;
p_input->p_current_data = NULL;

4
src/interface/interface.c
View File

@ -4,7 +4,7 @@
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: interface.c,v 1.94 2002/06/01 12:32:01 sam Exp $
* $Id: interface.c,v 1.95 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
@ -55,7 +55,7 @@ static void Manager( intf_thread_t *p_intf );
* This function opens output devices and creates specific interfaces. It sends
* its own error messages.
*****************************************************************************/
intf_thread_t* intf_Create( vlc_object_t *p_this )
intf_thread_t* __intf_Create( vlc_object_t *p_this )
{
intf_thread_t * p_intf;
char *psz_name;

4
src/interface/intf_eject.c
View File

@ -2,7 +2,7 @@
* intf_eject.c: CD/DVD-ROM ejection handling functions
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: intf_eject.c,v 1.14 2002/06/01 16:45:35 sam Exp $
* $Id: intf_eject.c,v 1.15 2002/06/01 18:04:49 sam Exp $
*
* Author: Julien Blache <jb@technologeek.org> for the Linux part
* with code taken from the Linux "eject" command
@ -107,7 +107,7 @@ static int EjectSCSI ( int i_fd );
* returns 1 on failure
* returns -1 if not implemented
*****************************************************************************/
int intf_Eject( vlc_object_t *p_this, const char *psz_device )
int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
{
int i_ret;

106
src/libvlc.c
View File

@ -4,7 +4,7 @@
* and spawns threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: libvlc.c,v 1.3 2002/06/01 16:45:34 sam Exp $
* $Id: libvlc.c,v 1.4 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -98,8 +98,8 @@ static volatile vlc_t **pp_vlc = NULL;
* Local prototypes
*****************************************************************************/
static int GetFilenames ( vlc_t *, int, char *[] );
static void Usage ( vlc_object_t *, const char *psz_module_name );
static void ListModules ( vlc_object_t * );
static void Usage ( vlc_t *, const char *psz_module_name );
static void ListModules ( vlc_t * );
static void Version ( void );
static void Build ( void );
@ -139,11 +139,11 @@ vlc_t * vlc_create( void )
p_vlc->b_quiet = 0; /* FIXME: delay message queue output! */
/* Initialize the threads system */
vlc_threads_init( p_vlc->p_this );
vlc_threads_init( p_vlc );
/* Initialize mutexes */
vlc_mutex_init( p_vlc->p_this, &p_vlc->config_lock );
vlc_mutex_init( p_vlc->p_this, &p_vlc->structure_lock );
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
vlc_mutex_init( p_vlc, &p_vlc->structure_lock );
/* Set signal handling policy for all threads */
#ifndef WIN32
@ -190,7 +190,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
/* Guess what CPU we have */
p_vlc->i_cpu_capabilities = CPUCapabilities( p_vlc->p_this );
p_vlc->i_cpu_capabilities = CPUCapabilities( p_vlc );
/*
* Support for gettext
@ -217,12 +217,12 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/*
* System specific initialization code
*/
system_Init( p_vlc->p_this, &i_argc, ppsz_argv );
system_Init( p_vlc, &i_argc, ppsz_argv );
/*
* Initialize message queue
*/
msg_Create( p_vlc->p_this );
msg_Create( p_vlc );
/* Get the executable name (similar to the basename command) */
if( i_argc > 0 )
@ -244,15 +244,15 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
* module. We need to do this at this stage to be able to display a short
* help if required by the user. (short help == main module options)
*/
module_InitBank( p_vlc->p_this );
module_LoadMain( p_vlc->p_this );
module_InitBank( p_vlc );
module_LoadMain( p_vlc );
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
{
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
@ -261,13 +261,13 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
p_vlc->module_bank.first = p_help_module;
/* End hack */
if( config_LoadCmdLine( p_vlc->p_this, &i_argc, ppsz_argv, 1 ) )
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, 1 ) )
{
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
@ -277,13 +277,13 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
fprintf( stderr, _("Usage: %s [options] [parameters] [file]...\n"),
p_vlc->psz_object_name );
Usage( p_vlc->p_this, "help" );
Usage( p_vlc->p_this, "main" );
Usage( p_vlc, "help" );
Usage( p_vlc, "main" );
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EEXIT;
}
@ -294,8 +294,8 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EEXIT;
}
@ -306,8 +306,8 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EEXIT;
}
@ -321,8 +321,8 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
* list of configuration options exported by each module and loads their
* default values.
*/
module_LoadBuiltins( p_vlc->p_this );
module_LoadPlugins( p_vlc->p_this );
module_LoadBuiltins( p_vlc );
module_LoadPlugins( p_vlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
p_vlc->module_bank.i_count );
@ -334,37 +334,37 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/* Check for help on modules */
if( (p_tmp = config_GetPsz( p_vlc, "module" )) )
{
Usage( p_vlc->p_this, p_tmp );
Usage( p_vlc, p_tmp );
free( p_tmp );
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
/* Check for long help option */
if( config_GetInt( p_vlc, "longhelp" ) )
{
Usage( p_vlc->p_this, NULL );
Usage( p_vlc, NULL );
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EEXIT;
}
/* Check for module list option */
if( config_GetInt( p_vlc, "list" ) )
{
ListModules( p_vlc->p_this );
ListModules( p_vlc );
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EEXIT;
}
@ -378,12 +378,12 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
* Override default configuration with config file settings
*/
p_vlc->psz_homedir = config_GetHomeDir();
config_LoadConfigFile( p_vlc->p_this, NULL );
config_LoadConfigFile( p_vlc, NULL );
/*
* Override configuration with command line settings
*/
if( config_LoadCmdLine( p_vlc->p_this, &i_argc, ppsz_argv, 0 ) )
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, 0 ) )
{
#ifdef WIN32
ShowConsole();
@ -392,8 +392,8 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
"that they are valid.\nPress the RETURN key to continue..." );
getchar();
#endif
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
@ -401,7 +401,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/*
* System specific configuration
*/
system_Configure( p_vlc->p_this );
system_Configure( p_vlc );
/* p_vlc inititalization. FIXME ? */
p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
@ -461,7 +461,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
* Initialize shared resources and libraries
*/
if( config_GetInt( p_vlc, "network-channel" )
&& network_ChannelCreate( p_vlc->p_this ) )
&& network_ChannelCreate( p_vlc ) )
{
/* On error during Channels initialization, switch off channels */
msg_Err( p_vlc,
@ -478,12 +478,12 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/*
* Initialize playlist and get commandline files
*/
p_playlist = playlist_Create( p_vlc->p_this );
p_playlist = playlist_Create( p_vlc );
if( !p_playlist )
{
msg_Err( p_vlc, "playlist initialization failed" );
module_EndBank( p_vlc->p_this );
msg_Destroy( p_vlc->p_this );
module_EndBank( p_vlc );
msg_Destroy( p_vlc );
return VLC_EGENERIC;
}
@ -549,7 +549,7 @@ vlc_error_t vlc_add_intf( vlc_t *p_vlc, char *psz_module, vlc_bool_t b_block )
}
/* Try to create the interface */
p_intf = intf_Create( p_vlc->p_this );
p_intf = intf_Create( p_vlc );
if( psz_module )
{
@ -670,7 +670,7 @@ vlc_error_t vlc_end( vlc_t *p_vlc )
*/
if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
{
network_ChannelJoin( p_vlc->p_this, COMMON_CHANNEL );
network_ChannelJoin( p_vlc, COMMON_CHANNEL );
}
/*
@ -686,17 +686,17 @@ vlc_error_t vlc_end( vlc_t *p_vlc )
/*
* Free module bank
*/
module_EndBank( p_vlc->p_this );
module_EndBank( p_vlc );
/*
* System specific cleaning code
*/
system_End( p_vlc->p_this );
system_End( p_vlc );
/*
* Terminate messages interface and program
*/
msg_Destroy( p_vlc->p_this );
msg_Destroy( p_vlc );
/* Update the handle status */
p_vlc->i_status = VLC_STATUS_CREATED;
@ -790,7 +790,7 @@ vlc_error_t vlc_add_target( vlc_t *p_vlc, char *psz_target )
return VLC_ESTATUS;
}
playlist_Add( p_vlc->p_this, PLAYLIST_END, psz_target );
playlist_Add( p_vlc, PLAYLIST_END, psz_target );
return VLC_SUCCESS;
}
@ -809,7 +809,7 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/* We assume that the remaining parameters are filenames */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
{
playlist_Add( p_vlc->p_this, PLAYLIST_END, ppsz_argv[ i_opt ] );
playlist_Add( p_vlc, PLAYLIST_END, ppsz_argv[ i_opt ] );
}
return VLC_SUCCESS;
@ -820,7 +820,7 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
static void Usage( vlc_object_t *p_this, const char *psz_module_name )
static void Usage( vlc_t *p_this, const char *psz_module_name )
{
#define FORMAT_STRING " --%s%s%s%s%s%s %s%s\n"
/* option name prefix ------' | | | | | | |
@ -984,7 +984,7 @@ static void Usage( vlc_object_t *p_this, const char *psz_module_name )
* Print a list of all available modules (builtins and plugins) and a short
* description for each one.
*****************************************************************************/
static void ListModules( vlc_object_t *p_this )
static void ListModules( vlc_t *p_this )
{
module_t *p_module;
char psz_spaces[22];

12
src/misc/configuration.c
View File

@ -2,7 +2,7 @@
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.27 2002/06/01 12:32:01 sam Exp $
* $Id: configuration.c,v 1.28 2002/06/01 18:04:49 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
@ -326,7 +326,7 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
}
/* Initialize the global lock */
vlc_mutex_init( p_module->p_this, &p_module->config_lock );
vlc_mutex_init( p_module, &p_module->config_lock );
/* Do the duplication job */
for( i = 0; i < i_lines ; i++ )
@ -430,7 +430,7 @@ void config_UnsetCallbacks( module_config_t *p_new )
* This function is called to load the config options stored in the config
* file.
*****************************************************************************/
int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
module_t *p_module;
module_config_t *p_item;
@ -605,7 +605,7 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
* save.
* Really stupid no ?
*****************************************************************************/
int config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
{
module_t *p_module;
module_config_t *p_item;
@ -827,8 +827,8 @@ int config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
* because we don't know (and don't want to know) in advance the configuration
* options used (ie. exported) by each module.
*****************************************************************************/
int config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
vlc_bool_t b_ignore_errors )
int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
vlc_bool_t b_ignore_errors )
{
int i_cmd, i_index, i_opts, i_shortopts, flag;
module_t *p_module;

4
src/misc/cpu.c
View File

@ -2,7 +2,7 @@
* cpu.c: CPU detection code
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: cpu.c,v 1.1 2002/06/01 12:32:01 sam Exp $
* $Id: cpu.c,v 1.2 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Christophe Massiot <massiot@via.ecp.fr>
@ -57,7 +57,7 @@ static char *psz_capability;
*****************************************************************************
* This function is called to list extensions the CPU may have.
*****************************************************************************/
u32 CPUCapabilities( vlc_object_t *p_this )
u32 __CPUCapabilities( vlc_object_t *p_this )
{
volatile u32 i_capabilities = CPU_CAPABILITY_NONE;

10
src/misc/messages.c
View File

@ -4,7 +4,7 @@
* modules, especially intf modules. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: messages.c,v 1.1 2002/06/01 12:32:01 sam Exp $
* $Id: messages.c,v 1.2 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -59,7 +59,7 @@ static char *ConvertPrintfFormatString ( const char *psz_format );
* This functions has to be called before any call to other msg_* functions.
* It set up the locks and the message queue if it is used.
*****************************************************************************/
void msg_Create( vlc_object_t *p_this )
void __msg_Create( vlc_object_t *p_this )
{
/* Message queue initialization */
vlc_mutex_init( p_this, &p_this->p_vlc->msg_bank.lock );
@ -77,7 +77,7 @@ void msg_Create( vlc_object_t *p_this )
* resources allocated by msg_Create.
* No other messages interface functions should be called after this one.
*****************************************************************************/
void msg_Destroy( vlc_object_t *p_this )
void __msg_Destroy( vlc_object_t *p_this )
{
/* Destroy lock */
vlc_mutex_destroy( &p_this->p_vlc->msg_bank.lock );
@ -94,7 +94,7 @@ void msg_Destroy( vlc_object_t *p_this )
/*****************************************************************************
* msg_Subscribe: subscribe to the message queue.
*****************************************************************************/
msg_subscription_t *msg_Subscribe( vlc_object_t *p_this )
msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this )
{
msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
@ -121,7 +121,7 @@ msg_subscription_t *msg_Subscribe( vlc_object_t *p_this )
/*****************************************************************************
* msg_Unsubscribe: unsubscribe from the message queue.
*****************************************************************************/
void msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
{
int i_index;

16
src/misc/modules.c
View File

@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.c,v 1.63 2002/06/01 12:32:01 sam Exp $
* $Id: modules.c,v 1.64 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
@ -112,7 +112,7 @@ static module_symbols_t symbols;
* This function creates a module bank structure which will be filled later
* on with all the modules found.
*****************************************************************************/
void module_InitBank( vlc_object_t *p_this )
void __module_InitBank( vlc_object_t *p_this )
{
p_this->p_vlc->module_bank.first = NULL;
p_this->p_vlc->module_bank.i_count = 0;
@ -134,7 +134,7 @@ void module_InitBank( vlc_object_t *p_this )
* This function resets the module bank by unloading all unused plugin
* modules.
*****************************************************************************/
void module_ResetBank( vlc_object_t *p_this )
void __module_ResetBank( vlc_object_t *p_this )
{
msg_Err( p_this, "FIXME: module_ResetBank unimplemented" );
return;
@ -146,7 +146,7 @@ void module_ResetBank( vlc_object_t *p_this )
* This function unloads all unused plugin modules and empties the module
* bank in case of success.
*****************************************************************************/
void module_EndBank( vlc_object_t *p_this )
void __module_EndBank( vlc_object_t *p_this )
{
module_t * p_next;
@ -179,7 +179,7 @@ void module_EndBank( vlc_object_t *p_this )
* as another module, and for instance the configuration options of main will
* be available in the module bank structure just as for every other module.
*****************************************************************************/
void module_LoadMain( vlc_object_t *p_this )
void __module_LoadMain( vlc_object_t *p_this )
{
AllocateBuiltinModule( p_this, InitModule__MODULE_main,
ActivateModule__MODULE_main,
@ -191,7 +191,7 @@ void module_LoadMain( vlc_object_t *p_this )
*****************************************************************************
* This function fills the module bank structure with the builtin modules.
*****************************************************************************/
void module_LoadBuiltins( vlc_object_t * p_this )
void __module_LoadBuiltins( vlc_object_t * p_this )
{
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
@ -202,7 +202,7 @@ void module_LoadBuiltins( vlc_object_t * p_this )
*****************************************************************************
* This function fills the module bank structure with the plugin modules.
*****************************************************************************/
void module_LoadPlugins( vlc_object_t * p_this )
void __module_LoadPlugins( vlc_object_t * p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
msg_Dbg( p_this, "checking plugin modules" );
@ -216,7 +216,7 @@ void module_LoadPlugins( vlc_object_t * p_this )
* This function parses the module bank and hides modules that have been
* unused for a while.
*****************************************************************************/
void module_ManageBank( vlc_object_t *p_this )
void __module_ManageBank( vlc_object_t *p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
module_t * p_module;

23
src/misc/modules_plugin.h
View File

@ -179,7 +179,7 @@ static inline const char * module_error( char *psz_buffer )
* STORE_SYMBOLS: store known symbols into p_symbols for plugin access.
*****************************************************************************/
#define STORE_SYMBOLS( p_symbols ) \
(p_symbols)->aout_CreateFifo_inner = aout_CreateFifo; \
(p_symbols)->__aout_CreateFifo_inner = __aout_CreateFifo; \
(p_symbols)->aout_DestroyFifo_inner = aout_DestroyFifo; \
(p_symbols)->__config_GetInt_inner = __config_GetInt; \
(p_symbols)->__config_PutInt_inner = __config_PutInt; \
@ -187,10 +187,10 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->__config_PutFloat_inner = __config_PutFloat; \
(p_symbols)->__config_GetPsz_inner = __config_GetPsz; \
(p_symbols)->__config_PutPsz_inner = __config_PutPsz; \
(p_symbols)->config_LoadCmdLine_inner = config_LoadCmdLine; \
(p_symbols)->__config_LoadCmdLine_inner = __config_LoadCmdLine; \
(p_symbols)->config_GetHomeDir_inner = config_GetHomeDir; \
(p_symbols)->config_LoadConfigFile_inner = config_LoadConfigFile; \
(p_symbols)->config_SaveConfigFile_inner = config_SaveConfigFile; \
(p_symbols)->__config_LoadConfigFile_inner = __config_LoadConfigFile; \
(p_symbols)->__config_SaveConfigFile_inner = __config_SaveConfigFile; \
(p_symbols)->config_FindConfig_inner = config_FindConfig; \
(p_symbols)->config_Duplicate_inner = config_Duplicate; \
(p_symbols)->config_SetCallbacks_inner = config_SetCallbacks; \
@ -229,7 +229,6 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->input_ClockManageControl_inner = input_ClockManageControl; \
(p_symbols)->input_ClockManageRef_inner = input_ClockManageRef; \
(p_symbols)->input_ClockGetTS_inner = input_ClockGetTS; \
(p_symbols)->input_BuffersInit_inner = input_BuffersInit; \
(p_symbols)->input_BuffersEnd_inner = input_BuffersEnd; \
(p_symbols)->input_NewBuffer_inner = input_NewBuffer; \
(p_symbols)->input_ReleaseBuffer_inner = input_ReleaseBuffer; \
@ -256,9 +255,7 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->input_FDRead_inner = input_FDRead; \
(p_symbols)->input_FDNetworkRead_inner = input_FDNetworkRead; \
(p_symbols)->input_FDSeek_inner = input_FDSeek; \
(p_symbols)->msg_Subscribe_inner = msg_Subscribe; \
(p_symbols)->msg_Unsubscribe_inner = msg_Unsubscribe; \
(p_symbols)->intf_Eject_inner = intf_Eject; \
(p_symbols)->__intf_Eject_inner = __intf_Eject; \
(p_symbols)->GetLang_1_inner = GetLang_1; \
(p_symbols)->GetLang_2T_inner = GetLang_2T; \
(p_symbols)->GetLang_2B_inner = GetLang_2B; \
@ -269,10 +266,10 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->mdate_inner = mdate; \
(p_symbols)->mwait_inner = mwait; \
(p_symbols)->msleep_inner = msleep; \
(p_symbols)->network_ChannelJoin_inner = network_ChannelJoin; \
(p_symbols)->network_ChannelCreate_inner = network_ChannelCreate; \
(p_symbols)->__network_ChannelJoin_inner = __network_ChannelJoin; \
(p_symbols)->__network_ChannelCreate_inner = __network_ChannelCreate; \
(p_symbols)->playlist_Command_inner = playlist_Command; \
(p_symbols)->playlist_Add_inner = playlist_Add; \
(p_symbols)->__playlist_Add_inner = __playlist_Add; \
(p_symbols)->playlist_Delete_inner = playlist_Delete; \
(p_symbols)->__vlc_threads_init_inner = __vlc_threads_init; \
(p_symbols)->vlc_threads_end_inner = vlc_threads_end; \
@ -283,7 +280,7 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->__vlc_thread_create_inner = __vlc_thread_create; \
(p_symbols)->__vlc_thread_ready_inner = __vlc_thread_ready; \
(p_symbols)->__vlc_thread_join_inner = __vlc_thread_join; \
(p_symbols)->vout_CreateThread_inner = vout_CreateThread; \
(p_symbols)->__vout_CreateThread_inner = __vout_CreateThread; \
(p_symbols)->vout_DestroyThread_inner = vout_DestroyThread; \
(p_symbols)->vout_ChromaCmp_inner = vout_ChromaCmp; \
(p_symbols)->vout_CreatePicture_inner = vout_CreatePicture; \
@ -302,6 +299,8 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->__msg_Err_inner = __msg_Err; \
(p_symbols)->__msg_Warn_inner = __msg_Warn; \
(p_symbols)->__msg_Dbg_inner = __msg_Dbg; \
(p_symbols)->__msg_Subscribe_inner = __msg_Subscribe; \
(p_symbols)->__msg_Unsubscribe_inner = __msg_Unsubscribe; \
(p_symbols)->__vlc_object_create_inner = __vlc_object_create; \
(p_symbols)->__vlc_object_destroy_inner = __vlc_object_destroy; \
(p_symbols)->__vlc_object_find_inner = __vlc_object_find; \

6
src/misc/netutils.c
View File

@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: netutils.c,v 1.67 2002/06/01 12:32:01 sam Exp $
* $Id: netutils.c,v 1.68 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
@ -107,7 +107,7 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string );
* once before any input thread is created or any call to other
* input_Channel*() function is attempted.
*****************************************************************************/
int network_ChannelCreate( vlc_object_t *p_this )
int __network_ChannelCreate( vlc_object_t *p_this )
{
#if !defined( SYS_LINUX ) && !defined( WIN32 )
msg_Err( p_this, "VLAN-based channels are not supported "
@ -141,7 +141,7 @@ int network_ChannelCreate( vlc_object_t *p_this )
* should be unlocked using input_ChannelLeave().
* Non 0 will be returned in case of error.
*****************************************************************************/
int network_ChannelJoin( vlc_object_t *p_this, int i_channel )
int __network_ChannelJoin( vlc_object_t *p_this, int i_channel )
{
#define VLCS_VERSION 13
#define MESSAGE_LENGTH 256

6
src/misc/objects.c
View File

@ -2,7 +2,7 @@
* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: objects.c,v 1.2 2002/06/01 13:52:24 sam Exp $
* $Id: objects.c,v 1.3 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -96,7 +96,7 @@ static void vlc_dumpstructure_inner( vlc_object_t *p_this,
psz_thread[0] = '\0';
if( p_this->b_thread )
{
snprintf( psz_thread, 20, " (thread %d)", p_this->thread_id );
snprintf( psz_thread, 20, " (thread %d)", p_this->i_thread );
psz_thread[19] = '\0';
}
@ -206,8 +206,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
p_new->b_die = 0;
p_new->b_error = 0;
p_new->p_this = p_new;
/* If i_type is root, then p_new is our own p_vlc */
if( i_type == VLC_OBJECT_ROOT )
{

3
src/misc/threads.c
View File

@ -2,7 +2,7 @@
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: threads.c,v 1.3 2002/06/01 16:45:35 sam Exp $
* $Id: threads.c,v 1.4 2002/06/01 18:04:49 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -444,6 +444,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
p_this->thread_id, psz_name, psz_file, i_line );
p_this->b_thread = 1;
p_this->i_thread = p_this->thread_id; /* We hope the cast will work */
if( b_wait )
{

10
src/playlist/playlist.c
View File

@ -2,7 +2,7 @@
* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.1 2002/06/01 12:32:02 sam Exp $
* $Id: playlist.c,v 1.2 2002/06/01 18:04:49 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
@ -45,7 +45,7 @@ static void RunThread ( playlist_t * );
*****************************************************************************
* Create a playlist structure.
*****************************************************************************/
playlist_t * playlist_Create ( vlc_object_t *p_parent )
playlist_t * __playlist_Create ( vlc_object_t *p_parent )
{
playlist_t *p_playlist;
@ -99,7 +99,7 @@ void playlist_Destroy( playlist_t * p_playlist )
* Add an item to the playlist at position i_pos. If i_pos is PLAYLIST_END,
* add it at the end regardless of the playlist current size.
*****************************************************************************/
int playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
int __playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
{
playlist_t *p_playlist;
@ -109,7 +109,7 @@ int playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
if( p_playlist == NULL )
{
msg_Dbg( p_this, "no playlist present, creating one" );
p_playlist = playlist_Create( p_this->p_vlc->p_this );
p_playlist = playlist_Create( p_this->p_vlc );
if( p_playlist == NULL )
{
@ -240,7 +240,7 @@ static void RunThread ( playlist_t *p_playlist )
//p_playlist->i_mode = PLAYLIST_FORWARD +
// config_GetInt( p_playlist, "loop-playlist" );
msg_Dbg( p_playlist, "creating new input thread" );
p_input = input_CreateThread( p_playlist->p_this,
p_input = input_CreateThread( p_playlist,
p_playlist->pp_items[p_playlist->i_index], NULL );
if( p_input != NULL )
{

4
src/video_output/video_output.c
View File

@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: video_output.c,v 1.181 2002/06/01 12:32:02 sam Exp $
* $Id: video_output.c,v 1.182 2002/06/01 18:04:49 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
@ -61,7 +61,7 @@ static void InitWindowSize ( vout_thread_t *, int *, int * );
* This function creates a new video output thread, and returns a pointer
* to its description. On error, it returns NULL.
*****************************************************************************/
vout_thread_t * vout_CreateThread ( vlc_object_t *p_parent,
vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
int i_width, int i_height,
u32 i_chroma, int i_aspect )
{