/*****************************************************************************
* Required vlc headers
*****************************************************************************/
-#if defined( _MSC_VER )
-# pragma warning( disable : 4244 )
-#endif
-
#include "vlc_config.h"
/*****************************************************************************
# include <stdbool.h>
#endif
+/*****************************************************************************
+ * Compilers definitions
+ *****************************************************************************/
/* Helper for GCC version checks */
#ifdef __GNUC__
# define VLC_GCC_VERSION(maj,min) \
#define PRIx64 "llx"
#define snprintf __mingw_snprintf
#define vsnprintf __mingw_vsnprintf
+ #define swprintf _snwprintf
#endif
/* Function attributes for compiler warnings */
/* Branch prediction */
#ifdef __GNUC__
-# define likely(p) __builtin_expect(!!(p), 1)
-# define unlikely(p) __builtin_expect(!!(p), 0)
+# define likely(p) __builtin_expect(!!(p), 1)
+# define unlikely(p) __builtin_expect(!!(p), 0)
+# define unreachable() __builtin_unreachable()
#else
-# define likely(p) (!!(p))
-# define unlikely(p) (!!(p))
+# define likely(p) (!!(p))
+# define unlikely(p) (!!(p))
+# define unreachable() ((void)0)
#endif
+#define vlc_assert_unreachable() (assert(!"unreachable"), unreachable())
+
/* Linkage */
#ifdef __cplusplus
# define VLC_EXTERN extern "C"
# 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")))
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
-#if defined( WIN32 ) || defined( UNDER_CE )
-# include <malloc.h>
-# ifndef PATH_MAX
-# define PATH_MAX MAX_PATH
-# endif
-#endif
-
-#ifdef __SYMBIAN32__
- #include <sys/syslimits.h>
-#endif
-
/**
* High precision date or time interval
*
/* Playlist */
-/* FIXME */
-/**
- * Playlist commands
- */
-typedef enum {
- PLAYLIST_PLAY, /**< No arg. res=can fail*/
- PLAYLIST_VIEWPLAY, /**< arg1= playlist_item_t*,*/
- /** arg2 = playlist_item_t* , res=can fail */
- PLAYLIST_PAUSE, /**< No arg res=can fail*/
- PLAYLIST_STOP, /**< No arg res=can fail*/
- PLAYLIST_SKIP, /**< arg1=int, res=can fail*/
-} playlist_command_t;
-
-
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;
/* 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 audio_format_t audio_sample_format_t;
/* Video */
/* 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;
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;
/* misc */
typedef struct vlc_meta_t vlc_meta_t;
typedef struct input_stats_t input_stats_t;
+typedef struct addon_entry_t addon_entry_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
float f_float;
char * psz_string;
void * p_address;
- vlc_object_t * p_object;
vlc_list_t * p_list;
mtime_t i_time;
struct { int32_t x; int32_t y; } coords;
*/
struct vlc_list_t
{
- int i_count;
- vlc_value_t * p_values;
- int * pi_types;
-
+ int i_type;
+ int i_count;
+ vlc_value_t *p_values;
};
/*****************************************************************************
* 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
+ * Variable callbacks: called when the value is modified
*****************************************************************************/
typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
char const *, /* variable name */
vlc_value_t, /* new value */
void * ); /* callback data */
+/*****************************************************************************
+ * List callbacks: called when elements are added/removed from the list
+ *****************************************************************************/
+typedef int ( * vlc_list_callback_t ) ( vlc_object_t *, /* variable's object */
+ char const *, /* variable name */
+ int, /* VLC_VAR_* action */
+ vlc_value_t *, /* new/deleted value */
+ void *); /* callback data */
+
+typedef enum
+{
+ vlc_value_callback,
+ vlc_list_callback
+} vlc_callback_type_t;
+
/*****************************************************************************
* OS-specific headers and thread types
*****************************************************************************/
-#if defined( WIN32 ) || defined( UNDER_CE )
-# include <windows.h>
+#if defined( _WIN32 )
+# include <malloc.h>
+# ifndef PATH_MAX
+# define PATH_MAX MAX_PATH
+# endif
+# include <windows.h>
+#endif
+
+#ifdef __SYMBIAN32__
+ #include <sys/syslimits.h>
#endif
#ifdef __OS2__
# define OS2EMX_PLAIN_CHAR
# define INCL_BASE
# define INCL_PM
+# include <os2safe.h>
# include <os2.h>
#endif
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 */ \
while (x)
{
- x = x >> 1;
+ x >>= 1;
i--;
}
return i;
/* 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)
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)
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)
| ((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
}
/* 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_ )
# 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 <tchar.h>
-#endif
+#endif /* _WIN32 */
VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t );
#include <AvailabilityMacros.h>
#endif
-#ifdef WIN32
-# include <malloc.h>
+#ifdef __MINGW32__
# define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
# define vlc_free(base) (__mingw_aligned_free(base))
+#elif defined(_MSC_VER)
+# define vlc_memalign(align, size) (_aligned_malloc(size, align))
+# define vlc_free(base) (_aligned_free(base))
#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
static inline void *vlc_memalign(size_t align, 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
*****************************************************************************/
#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 ';'
projects / vlc / blobdiff