* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.9 2002/07/12 21:57:25 massiot Exp $
+ * $Id: vlc_common.h,v 1.26 2002/08/30 22:22:24 massiot Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
*****************************************************************************/
/*****************************************************************************
- * Compiler-specific workarounds
+ * Required vlc headers
*****************************************************************************/
+#if defined( __BORLANDC__ )
+# undef PACKAGE
+#endif
+
+#include "config.h"
+
#if defined( __BORLANDC__ )
# undef HAVE_VARIADIC_MACROS
# undef HAVE_STDINT_H
#endif
+#include "vlc_config.h"
+#include "modules_inner.h"
+
/*****************************************************************************
* Required system headers
*****************************************************************************/
*****************************************************************************/
typedef s64 mtime_t;
+/*****************************************************************************
+ * The vlc_fourcc_t type.
+ *****************************************************************************
+ * See http://www.webartz.com/fourcc/ for a very detailed list.
+ *****************************************************************************/
+typedef u32 vlc_fourcc_t;
+
+#ifdef WORDS_BIGENDIAN
+# define VLC_FOURCC( a, b, c, d ) \
+ ( ((u32)d) | ( ((u32)c) << 8 ) | ( ((u32)b) << 16 ) | ( ((u32)a) << 24 ) )
+# define VLC_TWOCC( a, b ) \
+ ( (u16)(b) | ( (u16)(a) << 8 ) )
+
+#else
+# define VLC_FOURCC( a, b, c, d ) \
+ ( ((u32)a) | ( ((u32)b) << 8 ) | ( ((u32)c) << 16 ) | ( ((u32)d) << 24 ) )
+# define VLC_TWOCC( a, b ) \
+ ( (u16)(a) | ( (u16)(b) << 8 ) )
+
+#endif
+
/*****************************************************************************
* Classes declaration
*****************************************************************************/
/* Messages */
-VLC_DECLARE_STRUCT(msg_bank)
-VLC_DECLARE_STRUCT(msg_subscription)
+typedef struct msg_bank_t msg_bank_t;
+typedef struct msg_subscription_t msg_subscription_t;
/* Playlist */
-VLC_DECLARE_STRUCT(playlist)
-VLC_DECLARE_STRUCT(playlist_item)
+typedef struct playlist_t playlist_t;
+typedef struct playlist_item_t playlist_item_t;
/* Modules */
-VLC_DECLARE_STRUCT(module_bank)
-VLC_DECLARE_STRUCT(module)
-VLC_DECLARE_STRUCT(module_config)
-VLC_DECLARE_STRUCT(module_symbols)
-VLC_DECLARE_STRUCT(module_functions)
+typedef struct module_bank_t module_bank_t;
+typedef struct module_t module_t;
+typedef struct module_config_t module_config_t;
+typedef struct module_symbols_t module_symbols_t;
/* Interface */
-VLC_DECLARE_STRUCT(intf_thread)
-VLC_DECLARE_STRUCT(intf_sys)
-VLC_DECLARE_STRUCT(intf_console)
-VLC_DECLARE_STRUCT(intf_msg)
-VLC_DECLARE_STRUCT(intf_channel)
+typedef struct intf_thread_t intf_thread_t;
+typedef struct intf_sys_t intf_sys_t;
+typedef struct intf_console_t intf_console_t;
+typedef struct intf_msg_t intf_msg_t;
+typedef struct intf_channel_t intf_channel_t;
/* Input */
-VLC_DECLARE_STRUCT(input_thread)
-VLC_DECLARE_STRUCT(input_channel)
-VLC_DECLARE_STRUCT(input_cfg)
-VLC_DECLARE_STRUCT(input_area)
-VLC_DECLARE_STRUCT(input_buffers)
-VLC_DECLARE_STRUCT(input_socket)
+typedef struct input_thread_t input_thread_t;
+typedef struct input_channel_t input_channel_t;
+typedef struct input_area_t input_area_t;
+typedef struct input_buffers_t input_buffers_t;
+typedef struct input_socket_t input_socket_t;
+typedef struct input_info_t input_info_t;
+typedef struct input_info_category_t input_info_category_t;
+typedef struct access_sys_t access_sys_t;
+typedef struct demux_sys_t demux_sys_t;
+typedef struct es_descriptor_t es_descriptor_t;
+typedef struct es_sys_t es_sys_t;
+typedef struct pgrm_descriptor_t pgrm_descriptor_t;
+typedef struct pgrm_sys_t pgrm_sys_t;
+typedef struct stream_descriptor_t stream_descriptor_t;
+typedef struct stream_sys_t stream_sys_t;
/* Audio */
-VLC_DECLARE_STRUCT(aout_thread)
-VLC_DECLARE_STRUCT(aout_sys)
-VLC_DECLARE_STRUCT(aout_fifo)
+typedef struct aout_instance_t aout_instance_t;
+typedef struct aout_sys_t aout_sys_t;
+typedef struct aout_fifo_t aout_fifo_t;
+typedef struct aout_input_t aout_input_t;
+typedef struct aout_buffer_t aout_buffer_t;
+typedef struct audio_sample_format_t audio_sample_format_t;
+typedef struct audio_date_t audio_date_t;
/* Video */
-VLC_DECLARE_STRUCT(vout_thread)
-VLC_DECLARE_STRUCT(vout_font)
-VLC_DECLARE_STRUCT(vout_sys)
-VLC_DECLARE_STRUCT(chroma_sys)
-VLC_DECLARE_STRUCT(picture)
-VLC_DECLARE_STRUCT(picture_sys)
-VLC_DECLARE_STRUCT(picture_heap)
-VLC_DECLARE_STRUCT(subpicture)
-VLC_DECLARE_STRUCT(subpicture_sys)
+typedef struct vout_thread_t vout_thread_t;
+typedef struct vout_font_t vout_font_t;
+typedef struct vout_sys_t vout_sys_t;
+typedef struct chroma_sys_t chroma_sys_t;
+typedef struct picture_t picture_t;
+typedef struct picture_sys_t picture_sys_t;
+typedef struct picture_heap_t picture_heap_t;
+typedef struct subpicture_t subpicture_t;
+typedef struct subpicture_sys_t subpicture_sys_t;
+
+/* Stream output */
+typedef struct sout_instance_t sout_instance_t;
+typedef struct sout_fifo_t sout_fifo_t;
/* Decoders */
-VLC_DECLARE_STRUCT(decoder_fifo)
+typedef struct decoder_fifo_t decoder_fifo_t;
/* Misc */
-VLC_DECLARE_STRUCT(macroblock)
-VLC_DECLARE_STRUCT(data_packet)
-VLC_DECLARE_STRUCT(data_buffer)
-VLC_DECLARE_STRUCT(downmix)
-VLC_DECLARE_STRUCT(imdct)
-VLC_DECLARE_STRUCT(complex)
-VLC_DECLARE_STRUCT(dm_par)
-VLC_DECLARE_STRUCT(es_descriptor)
-VLC_DECLARE_STRUCT(pgrm_descriptor)
-VLC_DECLARE_STRUCT(stream_descriptor)
-VLC_DECLARE_STRUCT(stream_position)
-VLC_DECLARE_STRUCT(stream_ctrl)
-VLC_DECLARE_STRUCT(pes_packet)
-VLC_DECLARE_STRUCT(bit_stream)
-VLC_DECLARE_STRUCT(network_socket)
-VLC_DECLARE_STRUCT(iso639_lang)
+typedef struct data_packet_t data_packet_t;
+typedef struct data_buffer_t data_buffer_t;
+typedef struct stream_position_t stream_position_t;
+typedef struct stream_ctrl_t stream_ctrl_t;
+typedef struct pes_packet_t pes_packet_t;
+typedef struct bit_stream_t bit_stream_t;
+typedef struct network_socket_t network_socket_t;
+typedef struct iso639_lang_t iso639_lang_t;
/*****************************************************************************
* Plug-in stuff
*****************************************************************************/
#ifndef __PLUGIN__
-# define VLC_EXPORT( type, name, args ) type name args;
+# define VLC_EXPORT( type, name, args ) type name args
#else
-# define VLC_EXPORT( type, name, args ) ;
+# define VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
extern module_symbols_t* p_symbols;
#endif
volatile vlc_bool_t b_error; /* set by the object */ \
volatile vlc_bool_t b_die; /* set by the outside */ \
volatile vlc_bool_t b_dead; /* set by the object */ \
+ volatile vlc_bool_t b_attached; /* set by the object */ \
\
vlc_t * p_vlc; /* root of all evil */ \
\
- volatile int i_refcount; \
- vlc_object_t ** pp_parents; /* our parents */ \
- volatile int i_parents; \
+ volatile int i_refcount; /* usage count */ \
+ vlc_object_t * p_parent; /* our parent */ \
vlc_object_t ** pp_children; /* our children */ \
volatile int i_children; \
\
+ /* Private data */ \
+ void * p_private; \
+ \
/* Just a reminder so that people don't cast garbage */ \
int be_sure_to_add_VLC_COMMON_MEMBERS_to_struct; \
/* The real vlc_object_t type. Yes, it's that simple :-) */
-struct vlc_object_s
+struct vlc_object_t
{
VLC_COMMON_MEMBERS
};
-/* CAST_TO_VLC_OBJECT: attempt at doing a clever cast */
-#define CAST_TO_VLC_OBJECT( x ) \
+/* The object list */
+struct vlc_list_t
+{
+ int i_count;
+ vlc_object_t ** pp_objects;
+
+ /* Private */
+ int _i_extra;
+ vlc_object_t * _p_first;
+};
+
+/* VLC_OBJECT: attempt at doing a clever cast */
+#define VLC_OBJECT( x ) \
((vlc_object_t *)(x))+0*(x)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct
/*****************************************************************************
# define O_NONBLOCK 0
# endif
+ /* These two are not defined in mingw32 (bug?) */
# ifndef snprintf
-# define snprintf _snprintf /* snprintf not defined in mingw32 (bug?) */
+# define snprintf _snprintf
+# endif
+# ifndef vsnprintf
+# define vsnprintf _vsnprintf
# endif
#endif
/*****************************************************************************
* I18n stuff
*****************************************************************************/
-#ifndef PACKAGE /* Borland C++ uses this ! */
-#define PACKAGE VLC_PACKAGE
-#endif
-#define VERSION VLC_VERSION
-
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( MODULE_NAME_IS_gnome )
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( NEED_GNOMESUPPORT_H )
# include <libintl.h>
# undef _
# define _(String) dgettext (PACKAGE, String)
# else
# define N_(String) (String)
# endif
-#elif !defined( MODULE_NAME_IS_gnome )
+#elif !defined( NEED_GNOMESUPPORT_H )
# define _(String) (String)
# define N_(String) (String)
#endif
/*****************************************************************************
- * Plug-in stuff
+ * Additional vlc stuff
*****************************************************************************/
#include "vlc_symbols.h"
+#include "os_specific.h"
+#include "vlc_messages.h"
+#include "vlc_threads_funcs.h"
+#include "mtime.h"
+#include "modules.h"
+#include "main.h"
+#include "configuration.h"
+#include "vlc_objects.h"
+
+#if defined( __BORLANDC__ )
+# undef PACKAGE
+# define PACKAGE
+#endif
+