X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=a231d8343602e79eec4f0cbaf67b8a8cc206999b;hb=7e4419bcc6ed629cd9a06863965260b96b9cb1fa;hp=bc7290ad7190bbc157a97debf890a5439d83bd9e;hpb=cf270dd3c0201b2bb1ace5748e55d2300b782e38;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index bc7290ad71..a231d83436 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -50,6 +50,7 @@ #include #include #include +#include #ifndef __cplusplus # include @@ -138,14 +139,9 @@ static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc ) typedef struct vlc_list_t vlc_list_t; typedef struct vlc_object_t vlc_object_t; typedef struct libvlc_int_t libvlc_int_t; -typedef struct variable_t variable_t; typedef struct date_t date_t; typedef struct dict_entry_t dict_entry_t; typedef struct dict_t dict_t; -typedef struct gc_object_t gc_object_t ; - -/* Messages */ -typedef struct msg_subscription_t msg_subscription_t; /* Playlist */ @@ -170,8 +166,6 @@ typedef struct playlist_export_t playlist_export_t; typedef struct services_discovery_t services_discovery_t; typedef struct services_discovery_sys_t services_discovery_sys_t; typedef struct playlist_add_t playlist_add_t; -typedef struct playlist_preparse_t playlist_preparse_t; -typedef struct playlist_fetcher_t playlist_fetcher_t; /* Modules */ typedef struct module_bank_t module_bank_t; @@ -185,7 +179,6 @@ typedef struct config_category_t config_category_t; /* Interface */ 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 interaction_t interaction_t; typedef struct interaction_dialog_t interaction_dialog_t; @@ -263,12 +256,8 @@ typedef struct sout_stream_t sout_stream_t; typedef struct sout_stream_sys_t sout_stream_sys_t; typedef struct config_chain_t config_chain_t; -typedef struct sap_session_t sap_session_t; -typedef struct sap_address_t sap_address_t; typedef struct session_descriptor_t session_descriptor_t; typedef struct announce_method_t announce_method_t; -typedef struct announce_handler_t announce_handler_t; -typedef struct sap_handler_t sap_handler_t; typedef struct sout_param_t sout_param_t; typedef struct sout_pcat_t sout_pcat_t; @@ -384,9 +373,13 @@ typedef struct meta_engine_t meta_engine_t; /* stat/lstat/fstat */ #ifdef WIN32 #include + +# ifndef UNDER_CE struct _stati64; #define stat _stati64 #define fstat _fstati64 +#endif + /* You should otherwise use utf8_stat and utf8_lstat. */ #else struct stat; @@ -485,6 +478,9 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ # define LIBVLC_EXTERN extern #endif #if defined (WIN32) && defined (DLL_EXPORT) +#if defined (UNDER_CE) +# include +#endif # define LIBVLC_EXPORT __declspec(dllexport) #else # define LIBVLC_EXPORT @@ -498,18 +494,11 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ #if defined( WIN32 ) || defined( UNDER_CE ) # define WIN32_LEAN_AND_MEAN # include -# if defined( UNDER_CE ) -# define IS_WINNT 0 -# else -# define IS_WINNT ( GetVersion() < 0x80000000 ) -# endif #endif #include "vlc_mtime.h" #include "vlc_threads.h" -typedef struct vlc_object_internals_t vlc_object_internals_t; - /***************************************************************************** * Common structure members *****************************************************************************/ @@ -520,8 +509,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; * these members are common for all vlc objects \ */ \ /**@{*/ \ - int i_object_id; \ - int i_object_type; \ const char *psz_object_type; \ char *psz_object_name; \ \ @@ -532,8 +519,10 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; /* Object properties */ \ volatile bool b_error; /**< set by the object */ \ volatile bool b_die; /**< set by the outside */ \ - volatile bool b_dead; /**< set by the object */ \ - bool b_force; /**< set by the outside (eg. module_Need()) */ \ + bool b_force; /**< set by the outside (eg. module_need()) */ \ + \ + /** Just a reminder so that people don't cast garbage */ \ + bool be_sure_to_add_VLC_COMMON_MEMBERS_to_struct; \ \ /* Stuff related to the libvlc structure */ \ libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \ @@ -543,8 +532,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; /* 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; \ /**@}*/ \ /* VLC_OBJECT: attempt at doing a clever cast */ @@ -555,30 +542,26 @@ typedef struct vlc_object_internals_t vlc_object_internals_t; # define VLC_OBJECT( x ) ((vlc_object_t *)(x)) #endif -#define VLC_GC_MEMBERS \ -/** \name VLC_GC_MEMBERS \ - * these members are common to all objects that wish to be garbage-collected \ - */ \ -/**@{*/ \ - int i_gc_refcount; \ - void (*pf_destructor) ( gc_object_t * ); \ - void *p_destructor_arg; \ -/**@}*/ - -struct gc_object_t +typedef struct gc_object_t { - VLC_GC_MEMBERS -}; + vlc_spinlock_t spin; + uintptr_t refs; + void (*pf_destructor) (struct gc_object_t *); +} gc_object_t; -VLC_EXPORT(void, __vlc_gc_incref, ( gc_object_t * p_gc )); -VLC_EXPORT(void, __vlc_gc_decref, ( gc_object_t * p_gc )); -VLC_EXPORT(void, __vlc_gc_init, ( gc_object_t * p_gc, - void (*pf_destructor)( gc_object_t * ), void * arg)); +/** + * These members are common to all objects that wish to be garbage-collected. + */ +#define VLC_GC_MEMBERS gc_object_t vlc_gc_data; -#define vlc_gc_incref( a ) __vlc_gc_incref( (gc_object_t *)a ) -#define vlc_gc_decref( a ) __vlc_gc_decref( (gc_object_t *)a ) -#define vlc_gc_init( a,b,c ) __vlc_gc_init( (gc_object_t *)a,b,c ) +VLC_EXPORT(void *, vlc_gc_init, (gc_object_t *, void (*)(gc_object_t *))); +VLC_EXPORT(void *, vlc_hold, (gc_object_t *)); +VLC_EXPORT(void, vlc_release, (gc_object_t *)); +#define vlc_gc_init( a,b ) vlc_gc_init( &(a)->vlc_gc_data, (b) ) +#define vlc_gc_incref( a ) vlc_hold( &(a)->vlc_gc_data ) +#define vlc_gc_decref( a ) vlc_release( &(a)->vlc_gc_data ) +#define vlc_priv( gc, t ) ((t *)(((char *)(gc)) - offsetof(t, vlc_gc_data))) /***************************************************************************** * Macros and inline functions @@ -618,22 +601,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a ) else return a; } -/* Malloc with automatic error */ -#define MALLOC_VOID( var, type ) do { var = (type*)malloc( sizeof( type) ); \ - if( !var ) return; } while(0) -#define MALLOC_NULL( var, type ) do { var = (type*)malloc( sizeof( type) ); \ - if( !var ) return NULL; } while(0) -#define MALLOC_ERR( var, type ) do { var = (type*)malloc( sizeof( type) ); \ - if( !var ) return VLC_ENOMEM; } while(0) -#define MALLOC_GOTOERR( var, type ) do { var = (type*)malloc( sizeof( type) ); \ - if( !var ) goto error; } while(0) -#define DECMALLOC_VOID( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return; -#define DECMALLOC_ERR( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return VLC_ENOMEM; -#define DECMALLOC_NULL( var, type ) type* var = (type*)malloc( sizeof(type) );\ - if( !var ) return NULL; - +/* Free and set set the variable to NULL */ #define FREENULL(a) do { free( a ); a = NULL; } while(0) #define EMPTY_STR(str) (!str || !*str) @@ -770,7 +738,6 @@ VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) ); VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) LIBVLC_USED ); VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) LIBVLC_USED ); -char *vlc_strsep( char **, const char * ); #if defined(WIN32) || defined(UNDER_CE) /* win32, cl and icl support */