X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=bc179a0f4b075ea753cd43ce0f1009c8f97733e1;hb=dfc2996565842dbf644557debc80cb7cc8c2b4f4;hp=923586de31f5fb937857b822abd46d09cb9e64c6;hpb=3f07af6acdd8a0b0ddbd2c33b79039bf8ec8a822;p=vlc

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 923586de31..bc179a0f4b 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -29,30 +29,15 @@
  * This file is a collection of common definitions and types
  */
 
+#ifndef PACKAGE
+/* Temporary regression test */
+#error You probably forgot to include config.h!!
+#endif
+
 /*****************************************************************************
  * Required vlc headers
  *****************************************************************************/
-#if defined( __BORLANDC__ )
-#   undef PACKAGE
-#endif
-
-#include "config.h"
-
-#if defined(PACKAGE)
-#   undef PACKAGE_NAME
-#   define PACKAGE_NAME PACKAGE
-#endif
-#if defined(VERSION)
-#   undef PACKAGE_VERSION
-#   define PACKAGE_VERSION VERSION
-#endif
-
-#if defined( __BORLANDC__ )
-#   undef HAVE_VARIADIC_MACROS
-#   undef HAVE_STDINT_H
-#   undef HAVE_INTTYPES_H
-#   undef off_t
-#elif defined( _MSC_VER )
+#if defined( _MSC_VER )
 #   pragma warning( disable : 4244 )
 #endif
 
@@ -117,18 +102,6 @@ typedef uint8_t                 byte_t;
 #define INT64_MAX (9223372036854775807LL)
 #endif
 
-/* ptrdiff_t definition */
-#ifdef HAVE_STDDEF_H
-#   include <stddef.h>
-#else
-#   include <malloc.h>
-#   ifndef _PTRDIFF_T
-#       define _PTRDIFF_T
-/* Not portable in a 64-bit environment. */
-typedef int                 ptrdiff_t;
-#   endif
-#endif
-
 #if defined( WIN32 ) || defined( UNDER_CE )
 #   include <malloc.h>
 #   ifndef PATH_MAX
@@ -136,10 +109,6 @@ typedef int                 ptrdiff_t;
 #   endif
 #endif
 
-#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( _SSIZE_T_ )
-typedef int                 ssize_t;
-#endif
-
 /* Counter for statistics and profiling */
 typedef unsigned long       count_t;
 
@@ -152,10 +121,6 @@ typedef uint8_t             yuv_data_t;
 /* Audio volume */
 typedef uint16_t            audio_volume_t;
 
-#ifndef HAVE_SOCKLEN_T
-typedef int                 socklen_t;
-#endif
-
 /**
  * High precision date or time interval
  *
@@ -235,7 +200,6 @@ typedef struct msg_subscription_t msg_subscription_t;
  */
 typedef enum {
     PLAYLIST_PLAY,      /**< No arg.                            res=can fail*/
-    PLAYLIST_AUTOPLAY,  /**< No arg.                            res=cant fail*/
     PLAYLIST_VIEWPLAY,  /**< arg1= playlist_item_t*,*/
                         /**  arg2 = playlist_item_t*          , res=can fail */
     PLAYLIST_PAUSE,     /**< No arg                             res=can fail*/
@@ -281,6 +245,7 @@ typedef struct access_sys_t access_sys_t;
 typedef struct stream_t     stream_t;
 typedef struct stream_sys_t stream_sys_t;
 typedef struct demux_t  demux_t;
+typedef struct demux_meta_t demux_meta_t;
 typedef struct demux_sys_t demux_sys_t;
 typedef struct es_out_t     es_out_t;
 typedef struct es_out_id_t  es_out_id_t;
@@ -311,7 +276,6 @@ typedef struct aout_filter_t aout_filter_t;
 /* Video */
 typedef struct vout_thread_t vout_thread_t;
 typedef struct vout_sys_t vout_sys_t;
-typedef struct vout_synchro_t vout_synchro_t;
 typedef struct chroma_sys_t chroma_sys_t;
 
 typedef video_format_t video_frame_format_t;
@@ -365,8 +329,9 @@ typedef struct sout_gui_descr_t sout_gui_descr_t;
 typedef struct profile_parser_t profile_parser_t;
 
 /* Decoders */
-typedef struct decoder_t      decoder_t;
-typedef struct decoder_sys_t  decoder_sys_t;
+typedef struct decoder_t         decoder_t;
+typedef struct decoder_sys_t     decoder_sys_t;
+typedef struct decoder_synchro_t decoder_synchro_t;
 
 /* Encoders */
 typedef struct encoder_t      encoder_t;
@@ -382,6 +347,7 @@ typedef struct virtual_socket_t v_socket_t;
 typedef struct sockaddr sockaddr;
 typedef struct addrinfo addrinfo;
 typedef struct vlc_acl_t vlc_acl_t;
+typedef struct vlc_url_t vlc_url_t;
 
 /* Misc */
 typedef struct iso639_lang_t iso639_lang_t;
@@ -501,7 +467,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #  endif
 #else
 #  ifdef __cplusplus
-#    if HAVE_ATTRIBUTE_VISIBILITY
+#    ifdef HAVE_ATTRIBUTE_VISIBILITY
 #      define VLC_PUBLIC_API __attribute__((visibility("default")))
 #      define VLC_PRIVATE_API __attribute__((visibility("default")))
 #      define   VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
@@ -512,7 +478,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #      define VLC_INTERNAL( type, name, args ) extern "C" type name args
 #    endif
 #  else
-#    if HAVE_ATTRIBUTE_VISIBILITY
+#    ifdef HAVE_ATTRIBUTE_VISIBILITY
 #      define VLC_PUBLIC_API extern __attribute__((visibility("default")))
 #      define VLC_PRIVATE_API extern __attribute__((visibility("default")))
 #      define   VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
@@ -520,7 +486,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #    else
 #      define VLC_PUBLIC_API extern
 #      define VLC_PRIVATE_API extern
-#      define   VLC_EXPORT( type, name, args ) type name args
+#      define   VLC_EXPORT( type, name, args ) extern type name args
 #      define VLC_INTERNAL( type, name, args ) type name args
 #    endif
 #  endif
@@ -606,27 +572,42 @@ struct gc_object_t
             VLC_GC_MEMBERS
 };
 
+#include <assert.h> /* FIXME: should not be included here */
+
 static inline void __vlc_gc_incref( gc_object_t * p_gc )
 {
+    assert( p_gc->i_gc_refcount > 0 );
+
     p_gc->i_gc_refcount ++;
 };
 
 static inline void __vlc_gc_decref( gc_object_t *p_gc )
 {
+    if( !p_gc ) return;
+
+    assert( p_gc->i_gc_refcount > 0 );
+
     p_gc->i_gc_refcount -- ;
 
     if( p_gc->i_gc_refcount == 0 )
     {
         p_gc->pf_destructor( p_gc );
         /* Do not use the p_gc pointer from now on ! */
-     }
+    }
+}
+
+static inline void
+__vlc_gc_init( gc_object_t * p_gc, void (*pf_destructor)( gc_object_t * ),
+               void * arg)
+{
+    p_gc->i_gc_refcount = 1;
+    p_gc->pf_destructor = pf_destructor;
+    p_gc->p_destructor_arg = arg;
 }
 
 #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 ) {  ((gc_object_t *)a)->i_gc_refcount = 0; \
-                              ((gc_object_t *)a)->pf_destructor = b; \
-                              ((gc_object_t *)a)->p_destructor_arg = c; }
+#define vlc_gc_init( a,b,c ) __vlc_gc_init( (gc_object_t *)a,b,c )
 
 
 /*****************************************************************************
@@ -654,10 +635,15 @@ static inline void __vlc_gc_decref( gc_object_t *p_gc )
 #   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
-static int64_t GCD( int64_t a, int64_t b )
+static inline int64_t GCD( int64_t a, int64_t b )
 {
-    if( b ) return GCD( b, a % b );
-    else return a;
+    while( b )
+    {
+        int64_t c = a % b;
+        a = b;
+        b = c;
+    }
+    return a;
 }
 
 /* function imported from libavutil/common.h */
@@ -683,8 +669,7 @@ static inline uint8_t clip_uint8_vlc( int32_t a )
 #define DECMALLOC_NULL( var, type ) type* var = (type*)malloc( sizeof(type) );\
                                     if( !var ) return NULL;
 
-#define FREENULL(a) do { if( a ) { free( a ); a = NULL; } } while(0)
-#define FREE(a) do { if( a ) { free( a ); } } while(0)
+#define FREENULL(a) do { free( a ); a = NULL; } while(0)
 
 #define EMPTY_STR(str) (!str || !*str)
 
@@ -817,109 +802,16 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
 /* */
 #define VLC_UNUSED(x) (void)(x)
 
-/* Alignment of critical dynamic data structure
- *
- * Not all platforms support memalign so we provide a vlc_memalign wrapper
- * void *vlc_memalign( size_t align, size_t size, void **pp_orig )
- * *pp_orig is the pointer that has to be freed afterwards.
- */
-#if 0
-#ifdef HAVE_POSIX_MEMALIGN
-#   define vlc_memalign(align,size,pp_orig) \
-    ( !posix_memalign( pp_orig, align, size ) ? *(pp_orig) : NULL )
-#endif
-#endif
-#ifdef HAVE_MEMALIGN
-    /* Some systems have memalign() but no declaration for it */
-    void * memalign( size_t align, size_t size );
-
-#   define vlc_memalign(pp_orig,align,size) \
-    ( *(pp_orig) = memalign( align, size ) )
-
-#else /* We don't have any choice but to align manually */
-#   define vlc_memalign(pp_orig,align,size) \
-    (( *(pp_orig) = malloc( size + align - 1 )) \
-        ? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \
-                       & (~(unsigned long)(align-1)) ) \
-        : NULL )
-
-#endif
-
 /* Stuff defined in src/extras/libc.c */
-#ifndef HAVE_STRDUP
-#   define strdup vlc_strdup
-    VLC_EXPORT( char *, vlc_strdup, ( const char *s ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_strdup NULL
-#endif
-
-#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
-#   define vasprintf vlc_vasprintf
-    VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_vasprintf NULL
-#endif
-
-#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
-#   define asprintf vlc_asprintf
-    VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_asprintf NULL
-#endif
-
-#ifndef HAVE_STRNDUP
-#   if defined(STRNDUP_IN_GNOME_H) && \
-        (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\
-         defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main))
-        /* Do nothing: gnome.h defines strndup for us */
-#   else
-#       define strndup vlc_strndup
-        VLC_EXPORT( char *, vlc_strndup, ( const char *s, size_t n ) );
-#   endif
-#elif !defined(__PLUGIN__)
-#   define vlc_strndup NULL
-#endif
-
-#ifndef HAVE_STRNLEN
-#   define strnlen vlc_strnlen
-    VLC_EXPORT( size_t, vlc_strnlen, ( const char *, size_t ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_strnlen NULL
-#endif
-
-#ifndef HAVE_STRLCPY
-#   define strlcpy vlc_strlcpy
-    VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_strlcpy NULL
-#endif
-
-#ifndef HAVE_ATOF
-#   define atof vlc_atof
-    VLC_EXPORT( double, vlc_atof, ( const char *nptr ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_atof NULL
-#endif
-
-#ifndef HAVE_STRTOF
-#   ifdef HAVE_STRTOD
-#       define strtof strtod
-#   endif
-#endif
-
-#ifndef HAVE_ATOLL
-#   define atoll vlc_atoll
-    VLC_EXPORT( int64_t, vlc_atoll, ( const char *nptr ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_atoll NULL
-#endif
-
-#ifndef HAVE_STRTOLL
-#   define strtoll vlc_strtoll
-    VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_strtoll NULL
-#endif
+VLC_EXPORT( char *, vlc_strdup, ( const char *s ) );
+VLC_EXPORT( int, vlc_vasprintf, (char **, const char *, va_list ) );
+VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) );
+VLC_EXPORT( char *, vlc_strndup, ( const char *s, size_t n ) );
+VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) );
+VLC_EXPORT( double, vlc_atof, ( const char *nptr ) );
+VLC_EXPORT( int64_t, vlc_atoll, ( const char *nptr ) );
+VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) );
+VLC_EXPORT( size_t, vlc_strnlen, ( const char *, size_t ) );
 
 #if defined(SYS_BEOS) \
  || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
@@ -927,71 +819,18 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
         long long quot; /* Quotient. */
         long long rem;  /* Remainder. */
     } lldiv_t;
-#   define lldiv vlc_lldiv
-    VLC_EXPORT( lldiv_t, vlc_lldiv, ( long long numer, long long denom ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_lldiv NULL
-#endif
-
-#ifndef HAVE_SCANDIR
-#   define scandir vlc_scandir
-#   define alphasort vlc_alphasort
-    struct dirent;
-    VLC_EXPORT( int, vlc_scandir, ( const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ) ) );
-    VLC_EXPORT( int, vlc_alphasort, ( const struct dirent **a, const struct dirent **b ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_scandir NULL
-#   define vlc_alphasort NULL
 #endif
+VLC_EXPORT( lldiv_t, vlc_lldiv, ( long long numer, long long denom ) );
 
-#ifndef HAVE_GETENV
-#   define getenv vlc_getenv
-    VLC_EXPORT( char *, vlc_getenv, ( const char *name ) );
-#elif !defined(__PLUGIN__)
-#   define vlc_getenv NULL
-#endif
+struct dirent;
+VLC_EXPORT( int, vlc_scandir, ( const char *name, struct dirent ***namelist, int (*filter) ( const struct dirent * ), int (*compar) ( const struct dirent **, const struct dirent ** ) ) );
+VLC_EXPORT( int, vlc_alphasort, ( const struct dirent **a, const struct dirent **b ) );
 
-#ifndef HAVE_STRCASECMP
-#   ifndef HAVE_STRICMP
-#       define strcasecmp vlc_strcasecmp
-        VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) );
-#   else
-#       define strcasecmp stricmp
-#       if !defined(__PLUGIN__)
-#           define vlc_strcasecmp NULL
-#       endif
-#   endif
-#elif !defined(__PLUGIN__)
-#   define vlc_strcasecmp NULL
-#endif
+VLC_EXPORT( char *, vlc_getenv, ( const char *name ) );
 
-#ifndef HAVE_STRNCASECMP
-#   ifndef HAVE_STRNICMP
-#       define strncasecmp vlc_strncasecmp
-        VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) );
-#   else
-#       define strncasecmp strnicmp
-#       if !defined(__PLUGIN__)
-#           define vlc_strncasecmp NULL
-#       endif
-#   endif
-#elif !defined(__PLUGIN__)
-#   define vlc_strncasecmp NULL
-#endif
-
-#ifndef HAVE_STRCASESTR
-#   ifndef HAVE_STRISTR
-#       define strcasestr vlc_strcasestr
-        VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
-#   else
-#       define strcasestr stristr
-#       if !defined(__PLUGIN__)
-#           define vlc_strcasestr NULL
-#       endif
-#   endif
-#elif !defined(__PLUGIN__)
-#   define vlc_strcasestr NULL
-#endif
+VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) );
+VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) );
+VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) );
 
 #ifndef HAVE_DIRENT_H
     typedef void DIR;
@@ -1017,22 +856,16 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
     VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
     VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
     VLC_INTERNAL( long, vlc_telldir, ( void * ) );
-#else
-#   if !defined(__PLUGIN__)
-#       define vlc_opendir  NULL
-#       define vlc_readdir  NULL
-#       define vlc_closedir NULL
-#   endif
 #endif
 
 #if defined (WIN32)
 #   include <dirent.h>
-VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) );
-VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) );
-VLC_EXPORT( int, vlc_wclosedir, ( void * ) );
-VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
-VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
-VLC_INTERNAL( long, vlc_telldir, ( void * ) );
+ VLC_INTERNAL( void *, vlc_wopendir, ( const wchar_t * ) );
+ VLC_INTERNAL( struct _wdirent *, vlc_wreaddir, ( void * ) );
+ VLC_EXPORT( int, vlc_wclosedir, ( void * ) );
+ VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
+ VLC_INTERNAL( void, vlc_seekdir, ( void *, long ) );
+ VLC_INTERNAL( long, vlc_telldir, ( void * ) );
 #   define opendir Use_utf8_opendir_or_vlc_wopendir_instead!
 #   define readdir Use_utf8_readdir_or_vlc_wreaddir_instead!
 #   define closedir vlc_wclosedir
@@ -1042,8 +875,6 @@ VLC_INTERNAL( long, vlc_telldir, ( void * ) );
 #   define rewinddir vlc_rewinddir
 #   define seekdir vlc_seekdir
 #   define telldir vlc_telldir
-#elif !defined(__PLUGIN__)
-#   define vlc_wclosedir NULL
 #endif
 
 /* Format type specifiers for 64 bits numbers */
@@ -1183,7 +1014,7 @@ VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
  * I18n stuff
  *****************************************************************************/
 #ifdef WIN32
-VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
+    VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #endif
 
 #if defined( ENABLE_NLS ) && \
@@ -1223,7 +1054,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 /*****************************************************************************
  * Additional vlc stuff
  *****************************************************************************/
-#include "vlc_os_specific.h"
 #include "vlc_messages.h"
 #include "vlc_variables.h"
 #include "vlc_objects.h"
@@ -1241,11 +1071,6 @@ VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
 extern vlc_threadvar_t msg_context_global_key;
 
 
-#if defined( __BORLANDC__ )
-#   undef PACKAGE
-#   define PACKAGE
-#endif
-
 #if defined( WIN32 ) || defined( UNDER_CE )
 #   define DIR_SEP_CHAR '\\'
 #   define DIR_SEP "\\"