X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=db03b8160b880b0b7dc02183be023ae03bb85a73;hb=e488b28c67fe901fd7db6a4523fa0f7e5fed8ce8;hp=4c8c5e92440c8455359aa4305f533a64524c9721;hpb=06c9784ad684c52330495f9658fa662bdb5b9d10;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index 4c8c5e9244..db03b8160b 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -1,27 +1,27 @@ /***************************************************************************** - * common.h: common definitions + * vlc_common.h: common definitions * Collection of useful common types and macros definitions ***************************************************************************** - * Copyright (C) 1998-2011 the VideoLAN team + * Copyright (C) 1998-2011 VLC authors and VideoLAN * * Authors: Samuel Hocevar * Vincent Seguin * Gildas Bazin * Rémi Denis-Courmont * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -35,10 +35,6 @@ /***************************************************************************** * Required vlc headers *****************************************************************************/ -#if defined( _MSC_VER ) -# pragma warning( disable : 4244 ) -#endif - #include "vlc_config.h" /***************************************************************************** @@ -76,8 +72,8 @@ #define PRIo64 "llo" #undef PRIx64 #define PRIx64 "llx" - #define snprintf __mingw_snprintf - #define vsnprintf __mingw_vsnprintf + #define snprintf __mingw_snprintf + #define vsnprintf __mingw_vsnprintf #endif /* Function attributes for compiler warnings */ @@ -140,7 +136,7 @@ /***************************************************************************** * Basic types definitions *****************************************************************************/ -#if defined( WIN32 ) || defined( UNDER_CE ) +#if defined( WIN32 ) # include # ifndef PATH_MAX # define PATH_MAX MAX_PATH @@ -151,12 +147,6 @@ #include #endif -/* Counter for statistics and profiling */ -typedef unsigned long count_t; - -/* Audio volume */ -typedef uint16_t audio_volume_t; - /** * High precision date or time interval * @@ -276,7 +266,6 @@ 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 */ @@ -328,7 +317,6 @@ typedef struct filter_sys_t filter_sys_t; /* Network */ typedef struct virtual_socket_t v_socket_t; -typedef struct vlc_acl_t vlc_acl_t; typedef struct vlc_url_t vlc_url_t; /* Misc */ @@ -338,23 +326,6 @@ typedef struct iso639_lang_t iso639_lang_t; typedef struct block_t block_t; typedef struct block_fifo_t block_fifo_t; -/* httpd */ -typedef struct httpd_t httpd_t; -typedef struct httpd_host_t httpd_host_t; -typedef struct httpd_url_t httpd_url_t; -typedef struct httpd_client_t httpd_client_t; -typedef struct httpd_callback_sys_t httpd_callback_sys_t; -typedef struct httpd_message_t httpd_message_t; -typedef int (*httpd_callback_t)( httpd_callback_sys_t *, httpd_client_t *, httpd_message_t *answer, const httpd_message_t *query ); -typedef struct httpd_file_t httpd_file_t; -typedef struct httpd_file_sys_t httpd_file_sys_t; -typedef int (*httpd_file_callback_t)( httpd_file_sys_t *, httpd_file_t *, uint8_t *psz_request, uint8_t **pp_data, int *pi_data ); -typedef struct httpd_handler_t httpd_handler_t; -typedef struct httpd_handler_sys_t httpd_handler_sys_t; -typedef int (*httpd_handler_callback_t)( httpd_handler_sys_t *, httpd_handler_t *, char *psz_url, uint8_t *psz_request, int i_type, uint8_t *p_in, int i_in, char *psz_remote_addr, char *psz_remote_host, uint8_t **pp_data, int *pi_data ); -typedef struct httpd_redirect_t httpd_redirect_t; -typedef struct httpd_stream_t httpd_stream_t; - /* Hashing */ typedef struct md5_s md5_t; @@ -382,11 +353,6 @@ typedef struct vlm_message_t vlm_message_t; /* misc */ typedef struct vlc_meta_t vlc_meta_t; - -/* Stats */ -typedef struct counter_t counter_t; -typedef struct counter_sample_t counter_sample_t; -typedef struct stats_handler_t stats_handler_t; typedef struct input_stats_t input_stats_t; /* Update */ @@ -396,21 +362,6 @@ typedef struct update_iterator_t update_iterator_t; /* Meta engine */ 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 vlc_stat and vlc_lstat. */ -#else -struct stat; -#endif - /** * VLC value structure */ @@ -471,25 +422,20 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ /***************************************************************************** * OS-specific headers and thread types *****************************************************************************/ -#if defined( WIN32 ) || defined( UNDER_CE ) -/* WIN32_LEAN_AND_MEAN is needed to be able to include winsock2.h because else, - * windows.h will also include winsock.h and declarations will conflict */ -# define WIN32_LEAN_AND_MEAN +#if defined( WIN32 ) # include #endif +#ifdef __OS2__ +# define OS2EMX_PLAIN_CHAR +# define INCL_BASE +# define INCL_PM +# include +#endif + #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 *****************************************************************************/ @@ -534,26 +480,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 *****************************************************************************/ @@ -572,6 +498,9 @@ VLC_API void vlc_release(gc_object_t *); # define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) ) #endif +/* clip v in [min, max] */ +#define VLC_CLIP(v, min, max) __MIN(__MAX((v), (min)), (max)) + VLC_USED static inline int64_t GCD ( int64_t a, int64_t b ) { @@ -632,6 +561,24 @@ static inline unsigned popcount (unsigned x) #endif } +VLC_USED +static inline unsigned parity (unsigned x) +{ +#if VLC_GCC_VERSION(3,4) + return __builtin_parity (x); +#else + for (unsigned i = 4 * sizeof (x); i > 0; i /= 2) + x ^= x >> i; + return x & 1; +#endif +} + +#ifdef __OS2__ +# undef bswap16 +# undef bswap32 +# undef bswap64 +#endif + /** Byte swap (16 bits) */ VLC_USED static inline uint16_t bswap16 (uint16_t x) @@ -832,16 +779,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__ ) @@ -857,29 +795,10 @@ 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 @@ -927,14 +846,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 ) @@ -989,7 +905,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 ';'