X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=6116f8e53d3d43202a1f722622264c5974d84485;hb=a6a85ef927c02541847538f2ba148fb1c19b0370;hp=d73000ddeea9be9daabc1fdfb79f7a04eb8fec29;hpb=d521b25d6f20ae9029997f883763928c705da1b8;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index d73000ddee..6116f8e53d 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -35,10 +35,6 @@ /***************************************************************************** * Required vlc headers *****************************************************************************/ -#if defined( _MSC_VER ) -# pragma warning( disable : 4244 ) -#endif - #include "vlc_config.h" /***************************************************************************** @@ -56,6 +52,9 @@ # include #endif +/***************************************************************************** + * Compilers definitions + *****************************************************************************/ /* Helper for GCC version checks */ #ifdef __GNUC__ # define VLC_GCC_VERSION(maj,min) \ @@ -78,6 +77,7 @@ #define PRIx64 "llx" #define snprintf __mingw_snprintf #define vsnprintf __mingw_vsnprintf + #define swprintf _snwprintf #endif /* Function attributes for compiler warnings */ @@ -126,7 +126,7 @@ # define VLC_EXTERN #endif -#if defined (WIN32) && defined (DLL_EXPORT) +#if defined (_WIN32) && defined (DLL_EXPORT) # define VLC_EXPORT __declspec(dllexport) #elif VLC_GCC_VERSION(4,0) # define VLC_EXPORT __attribute__((visibility("default"))) @@ -140,20 +140,6 @@ /***************************************************************************** * Basic types definitions *****************************************************************************/ -#if defined( WIN32 ) || defined( UNDER_CE ) -# include -# ifndef PATH_MAX -# define PATH_MAX MAX_PATH -# endif -#endif - -#ifdef __SYMBIAN32__ - #include -#endif - -/* Audio volume */ -typedef uint16_t audio_volume_t; - /** * High precision date or time interval * @@ -232,7 +218,6 @@ typedef enum { typedef struct playlist_t playlist_t; typedef struct playlist_item_t playlist_item_t; -typedef struct playlist_view_t playlist_view_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; @@ -271,9 +256,6 @@ typedef struct video_palette_t video_palette_t; /* Audio */ typedef struct audio_output audio_output_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 block_t aout_buffer_t; typedef audio_format_t audio_sample_format_t; /* Video */ @@ -286,14 +268,12 @@ typedef struct picture_sys_t picture_sys_t; /* Subpictures */ typedef struct spu_t spu_t; typedef struct subpicture_t subpicture_t; -typedef struct subpicture_sys_t subpicture_sys_t; typedef struct subpicture_region_t subpicture_region_t; typedef struct image_handler_t image_handler_t; /* Stream output */ typedef struct sout_instance_t sout_instance_t; -typedef struct sout_instance_sys_t sout_instance_sys_t; typedef struct sout_input_t sout_input_t; typedef struct sout_packetizer_input_t sout_packetizer_input_t; @@ -348,13 +328,6 @@ typedef struct vod_t vod_t; typedef struct vod_sys_t vod_sys_t; typedef struct vod_media_t vod_media_t; -/* osdmenu */ -typedef struct osd_menu_t osd_menu_t; -typedef struct osd_state_t osd_state_t; -typedef struct osd_event_t osd_event_t; -typedef struct osd_button_t osd_button_t; -typedef struct osd_menu_state_t osd_menu_state_t; - /* VLM */ typedef struct vlm_t vlm_t; typedef struct vlm_message_t vlm_message_t; @@ -365,10 +338,6 @@ typedef struct input_stats_t input_stats_t; /* Update */ typedef struct update_t update_t; -typedef struct update_iterator_t update_iterator_t; - -/* Meta engine */ -typedef struct meta_engine_t meta_engine_t; /** * VLC value structure @@ -401,22 +370,15 @@ struct vlc_list_t /***************************************************************************** * Error values (shouldn't be exposed) *****************************************************************************/ -#define VLC_SUCCESS -0 /* No error */ -#define VLC_ENOMEM -1 /* Not enough memory */ -#define VLC_ETIMEOUT -3 /* Timeout */ - -#define VLC_ENOMOD -10 /* Module not found */ - -#define VLC_ENOOBJ -20 /* Object not found */ - -#define VLC_ENOVAR -30 /* Variable not found */ -#define VLC_EBADVAR -31 /* Bad variable value */ - -#define VLC_ENOITEM -40 /**< Item not found */ - -#define VLC_EEXIT -255 /* Program exited */ -#define VLC_EEXITSUCCESS -999 /* Program exited successfully */ -#define VLC_EGENERIC -666 /* Generic error */ +#define VLC_SUCCESS (-0) /**< No error */ +#define VLC_EGENERIC (-1) /**< Unspecified error */ +#define VLC_ENOMEM (-2) /**< Not enough memory */ +#define VLC_ETIMEOUT (-3) /**< Timeout */ +#define VLC_ENOMOD (-4) /**< Module not found */ +#define VLC_ENOOBJ (-5) /**< Object not found */ +#define VLC_ENOVAR (-6) /**< Variable not found */ +#define VLC_EBADVAR (-7) /**< Bad variable value */ +#define VLC_ENOITEM (-8) /**< Item not found */ /***************************************************************************** * Variable callbacks @@ -430,8 +392,16 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ /***************************************************************************** * OS-specific headers and thread types *****************************************************************************/ -#if defined( WIN32 ) || defined( UNDER_CE ) -# include +#if defined( _WIN32 ) +# include +# ifndef PATH_MAX +# define PATH_MAX MAX_PATH +# endif +# include +#endif + +#ifdef __SYMBIAN32__ + #include #endif #ifdef __OS2__ @@ -444,15 +414,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ #include "vlc_mtime.h" #include "vlc_threads.h" -/** - * Memory storage space for an atom. Never access it directly. - */ -typedef union -{ - volatile uintptr_t u; - volatile intptr_t s; -} vlc_atomic_t; - /***************************************************************************** * Common structure members *****************************************************************************/ @@ -470,7 +431,6 @@ typedef union int i_flags; \ \ /* Object properties */ \ - volatile bool b_die; /**< set by the outside */ \ bool b_force; /**< set by the outside (eg. module_need()) */ \ \ /* Stuff related to the libvlc structure */ \ @@ -497,26 +457,6 @@ typedef union # define VLC_OBJECT( x ) ((vlc_object_t *)(x)) #endif -typedef struct gc_object_t -{ - vlc_atomic_t refs; - void (*pf_destructor) (struct gc_object_t *); -} gc_object_t; - -/** - * These members are common to all objects that wish to be garbage-collected. - */ -#define VLC_GC_MEMBERS gc_object_t vlc_gc_data; - -VLC_API void * vlc_gc_init(gc_object_t *, void (*)(gc_object_t *)); -VLC_API void * vlc_hold(gc_object_t *); -VLC_API 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 *****************************************************************************/ @@ -569,7 +509,7 @@ static inline unsigned clz (unsigned x) while (x) { - x = x >> 1; + x >>= 1; i--; } return i; @@ -581,6 +521,24 @@ static inline unsigned clz (unsigned x) /* XXX: this assumes that int is 32-bits or more */ #define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8)) +/** Count trailing zeroes */ +VLC_USED +static inline unsigned ctz (unsigned x) +{ +#if VLC_GCC_VERSION(3,4) + return __builtin_ctz (x); +#else + unsigned i = sizeof (x) * 8; + + while (x) + { + x <<= 1; + i--; + } + return i; +#endif +} + /** Bit weight */ VLC_USED static inline unsigned popcount (unsigned x) @@ -627,7 +585,7 @@ static inline uint16_t bswap16 (uint16_t x) VLC_USED static inline uint32_t bswap32 (uint32_t x) { -#if VLC_GCC_VERSION(4,3) +#if VLC_GCC_VERSION(4,3) || defined(__clang__) return __builtin_bswap32 (x); #else return ((x & 0x000000FF) << 24) @@ -641,7 +599,7 @@ static inline uint32_t bswap32 (uint32_t x) VLC_USED static inline uint64_t bswap64 (uint64_t x) { -#if VLC_GCC_VERSION(4,3) +#if VLC_GCC_VERSION(4,3) || defined(__clang__) return __builtin_bswap64 (x); #elif !defined (__cplusplus) return ((x & 0x00000000000000FF) << 56) @@ -653,14 +611,14 @@ static inline uint64_t bswap64 (uint64_t x) | ((x & 0x00FF000000000000) >> 40) | ((x & 0xFF00000000000000) >> 56); #else - return ((x & 0x00000000000000FFLLU) << 56) - | ((x & 0x000000000000FF00LLU) << 40) - | ((x & 0x0000000000FF0000LLU) << 24) - | ((x & 0x00000000FF000000LLU) << 8) - | ((x & 0x000000FF00000000LLU) >> 8) - | ((x & 0x0000FF0000000000LLU) >> 24) - | ((x & 0x00FF000000000000LLU) >> 40) - | ((x & 0xFF00000000000000LLU) >> 56); + return ((x & 0x00000000000000FFULL) << 56) + | ((x & 0x000000000000FF00ULL) << 40) + | ((x & 0x0000000000FF0000ULL) << 24) + | ((x & 0x00000000FF000000ULL) << 8) + | ((x & 0x000000FF00000000ULL) >> 8) + | ((x & 0x0000FF0000000000ULL) >> 24) + | ((x & 0x00FF000000000000ULL) >> 40) + | ((x & 0xFF00000000000000ULL) >> 56); #endif } @@ -816,17 +774,7 @@ static inline void SetQWLE (void *p, uint64_t qw) /* Stuff defined in src/extras/libc.c */ -#if defined(WIN32) || defined(UNDER_CE) -/* win32, cl and icl support */ -# if defined( _MSC_VER ) || !defined( __MINGW32__ ) -# define __attribute__(x) -# define S_IFBLK 0x3000 /* Block */ -# define S_ISBLK(m) (0) -# define S_ISCHR(m) (0) -# define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO) -# define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) -# endif - +#if defined(_WIN32) /* several type definitions */ # if defined( __MINGW32__ ) # if !defined( _OFF_T_ ) @@ -841,31 +789,12 @@ static inline void SetQWLE (void *p, uint64_t qw) # endif # endif -# if defined( _MSC_VER ) -# if !defined( _OFF_T_DEFINED ) - typedef __int64 off_t; -# define _OFF_T_DEFINED -# else - /* for wx compatibility typedef long off_t; */ -# define off_t __int64 -# endif -# endif - -# if defined( __BORLANDC__ ) -# undef off_t -# define off_t unsigned __int64 -# endif - # ifndef O_NONBLOCK # define O_NONBLOCK 0 # endif -# ifndef alloca -# define alloca _alloca -# endif - # include -#endif +#endif /* _WIN32 */ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ); @@ -874,8 +803,7 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) #include #endif -#ifdef WIN32 -# include +#ifdef _WIN32 # define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align)) # define vlc_free(base) (__mingw_aligned_free(base)) #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) @@ -911,14 +839,11 @@ static inline void *vlc_memalign(size_t align, size_t size) VLC_API void vlc_tdestroy( void *, void (*)(void *) ); -/* Fast large memory copy and memory set */ -VLC_API void * vlc_memcpy( void *, const void *, size_t ); -#define vlc_memset memset - /***************************************************************************** * I18n stuff *****************************************************************************/ -VLC_API char * vlc_gettext( const char *msgid ) VLC_FORMAT_ARG(1); +VLC_API char *vlc_gettext( const char *msgid ) VLC_FORMAT_ARG(1); +VLC_API char *vlc_ngettext( const char *s, const char *p, unsigned long n ) VLC_FORMAT_ARG(1) VLC_FORMAT_ARG(2); #define vlc_pgettext( ctx, id ) \ vlc_pgettext_aux( ctx "\004" id, id ) @@ -957,6 +882,14 @@ static inline void *xcalloc (size_t n, size_t size) return ptr; } +static inline char *xstrdup (const char *str) +{ + char *ptr = strdup (str); + if (unlikely(ptr == NULL)) + abort (); + return ptr; +} + /***************************************************************************** * libvlc features *****************************************************************************/ @@ -973,7 +906,7 @@ VLC_API const char * VLC_Compiler( void ) VLC_USED; #include "vlc_main.h" #include "vlc_configuration.h" -#if defined( WIN32 ) || defined( UNDER_CE ) || defined( __SYMBIAN32__ ) || defined( __OS2__ ) +#if defined( _WIN32 ) || defined( __SYMBIAN32__ ) || defined( __OS2__ ) # define DIR_SEP_CHAR '\\' # define DIR_SEP "\\" # define PATH_SEP_CHAR ';'