X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=792bcd67583fa064f6313ccabab87b26fad980aa;hb=81b4ed0e042693eb474b39510d20fc886c50c920;hp=b2b3b4af2ba1cc4711a2ba6ece1a8a54976aefd3;hpb=6d6fcaba2c7b55b9817ec0ee8b0dc9239ea3895d;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index b2b3b4af2b..792bcd6758 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -74,7 +74,7 @@ /* Format string sanity checks */ #ifdef __GNUC__ -# if defined( _WIN32 ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 +# if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) ) # define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y))) # else # define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y))) @@ -156,13 +156,13 @@ typedef uint32_t vlc_fourcc_t; * \param fcc a vlc_fourcc_t * \param psz_fourcc string to store string representation of vlc_fourcc in */ -static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc ) +static inline void vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc ) { memcpy( psz_fourcc, &fcc, 4 ); } #define vlc_fourcc_to_char( a, b ) \ - __vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) ) + vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) ) /***************************************************************************** * Classes declaration @@ -212,6 +212,7 @@ typedef struct config_category_t config_category_t; typedef struct input_thread_t input_thread_t; typedef struct input_thread_sys_t input_thread_sys_t; typedef struct input_item_t input_item_t; +typedef struct input_item_node_t input_item_node_t; typedef struct access_t access_t; typedef struct access_sys_t access_sys_t; typedef struct stream_t stream_t; @@ -401,7 +402,7 @@ struct _stati64; #define fstat _fstati64 #endif -/* You should otherwise use utf8_stat and utf8_lstat. */ +/* You should otherwise use vlc_stat and utf8_lstat. */ #else struct stat; #endif @@ -419,11 +420,10 @@ typedef union vlc_object_t * p_object; vlc_list_t * p_list; mtime_t i_time; + struct { int32_t x; int32_t y; } coords; - struct { char *psz_name; int i_object_id; } var; - - /* Make sure the structure is at least 64bits */ - struct { char a, b, c, d, e, f, g, h; } padding; + /* Make sure the structure is at least 64bits */ + uint8_t padding[8]; } vlc_value_t; @@ -457,6 +457,7 @@ struct vlc_list_t #define VLC_VAR_ADDRESS 0x0070 #define VLC_VAR_MUTEX 0x0080 #define VLC_VAR_LIST 0x0090 +#define VLC_VAR_COORDS 0x00A0 /**@}*/ /***************************************************************************** @@ -536,13 +537,9 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ int i_flags; \ \ /* Object properties */ \ - volatile bool b_error; /**< set by the object */ \ volatile bool b_die; /**< set by the outside */ \ 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 */ \ \ @@ -551,9 +548,16 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ /**@}*/ \ /* VLC_OBJECT: attempt at doing a clever cast */ -#ifdef __GNUC__ -# define VLC_OBJECT( x ) \ - (((vlc_object_t *)(x))+0*(((__typeof__(x))0)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct)) +#if defined( __GNUC__ ) && __GNUC__ > 3 +# ifndef __cplusplus +# define VLC_OBJECT( x ) \ + __builtin_choose_expr(__builtin_offsetof(__typeof__(*x), psz_object_type), \ + (void)0 /* screw you */, (vlc_object_t *)(x)) +# else +# define VLC_OBJECT( x ) \ + ((vlc_object_t *)(x) \ + + 0 * __builtin_offsetof(__typeof__(*x), psz_object_type)) +# endif #else # define VLC_OBJECT( x ) ((vlc_object_t *)(x)) #endif @@ -617,6 +621,29 @@ static inline uint8_t clip_uint8_vlc( int32_t a ) else return a; } +/* Count leading zeroes */ +LIBVLC_USED +static inline unsigned clz (unsigned x) +{ +#ifdef __GNUC_ + return __builtin_clz (x); +#else + unsigned i = sizeof (x) * 8; + + while (x) + { + x = x >> 1; + i--; + } + return i; +#endif +} + +#define clz8( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint8_t)) * 8)) +#define clz16( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint16_t)) * 8)) +/* XXX: this assumes that int is 32-bits or more */ +#define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8)) + /* Free and set set the variable to NULL */ #define FREENULL(a) do { free( a ); a = NULL; } while(0) @@ -812,8 +839,8 @@ VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); /* execve wrapper (defined in src/extras/libc.c) */ -VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED ); -#define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i) +VLC_EXPORT( int, vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED ); +#define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i) /* dir wrappers (defined in src/extras/libc.c) */ VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir )); @@ -861,15 +888,14 @@ static inline void *xrealloc (void *ptr, size_t len) VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED ); VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED ); VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED ); -VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED ); VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED ); /***************************************************************************** * Additional vlc stuff *****************************************************************************/ #include "vlc_messages.h" -#include "vlc_variables.h" #include "vlc_objects.h" +#include "vlc_variables.h" #include "vlc_modules.h" #include "vlc_main.h" #include "vlc_configuration.h"