* Makefile.am : Added src/playlist/item-ext.c and src/playlist/info.c

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 50997146f37a3612e2c08aef4397c724d63cd567..241ad30167e4eb4f552509ebfe4c7c3bce49780d 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.88 2003/11/21 15:32:08 fenrir Exp $
+ * $Id: vlc_common.h,v 1.97 2004/01/05 12:59:43 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -93,6 +93,8 @@
     typedef unsigned long long  uint64_t;
     typedef signed long long    int64_t;
 #   endif
+    typedef uint32_t            uintptr_t;
+    typedef int32_t             intptr_t;
 #endif
 
 typedef uint8_t                 byte_t;
@@ -111,7 +113,9 @@ typedef int                 ptrdiff_t;
 
 #if defined( WIN32 )
 #   include <malloc.h>
-#define PATH_MAX MAX_PATH
+#   ifndef PATH_MAX
+#       define PATH_MAX MAX_PATH
+#   endif
 #endif
 
 #if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( _SSIZE_T_ )
@@ -134,23 +138,23 @@ typedef uint16_t            audio_volume_t;
 typedef int                 socklen_t;
 #endif
 
-/*****************************************************************************
- * mtime_t: high precision date or time interval
- *****************************************************************************
+/**
+ * High precision date or time interval
+ *
  * Store a high precision date or time interval. The maximum precision is the
  * microsecond, and a 64 bits integer is used to avoid overflows (maximum
  * time interval is then 292271 years, which should be long enough for any
  * video). Dates are stored as microseconds since a common date (usually the
  * epoch). Note that date and time intervals can be manipulated using regular
  * arithmetic operators, and that no special functions are required.
- *****************************************************************************/
+ */
 typedef int64_t mtime_t;
 
-/*****************************************************************************
+/**
  * The vlc_fourcc_t type.
- *****************************************************************************
+ *
  * See http://www.webartz.com/fourcc/ for a very detailed list.
- *****************************************************************************/
+ */
 typedef uint32_t vlc_fourcc_t;
 
 #ifdef WORDS_BIGENDIAN
@@ -186,6 +190,8 @@ typedef struct msg_subscription_t msg_subscription_t;
 typedef struct playlist_t playlist_t;
 typedef struct playlist_item_t playlist_item_t;
 typedef struct playlist_group_t playlist_group_t;
+typedef struct item_info_t item_info_t;
+typedef struct item_info_category_t item_info_category_t;
 
 /* Modules */
 typedef struct module_bank_t module_bank_t;
@@ -228,7 +234,7 @@ typedef struct stream_t stream_t;
 typedef struct es_out_t     es_out_t;
 typedef struct es_out_id_t  es_out_id_t;
 typedef struct es_out_sys_t es_out_sys_t;
-
+typedef struct demux_t  demux_t;
 
 /* Audio */
 typedef struct aout_instance_t aout_instance_t;
@@ -268,7 +274,6 @@ typedef struct sout_cfg_t       sout_cfg_t;
 typedef struct slp_session_t    slp_session_t;*/
 
 /* Decoders */
-typedef struct decoder_fifo_t decoder_fifo_t;
 typedef struct decoder_t      decoder_t;
 typedef struct decoder_sys_t  decoder_sys_t;
 
@@ -282,7 +287,6 @@ typedef struct data_buffer_t data_buffer_t;
 typedef struct stream_position_t stream_position_t;
 typedef struct stream_ctrl_t stream_ctrl_t;
 typedef struct pes_packet_t pes_packet_t;
-typedef struct bit_stream_t bit_stream_t;
 typedef struct network_socket_t network_socket_t;
 typedef struct iso639_lang_t iso639_lang_t;
 
@@ -448,13 +452,14 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #define TAB_APPEND( count, tab, p )             \
     if( (count) > 0 )                           \
     {                                           \
-        (tab) = realloc( (tab), sizeof( void ** ) * ( (count) + 1 ) ); \
+        (*(void **)(&tab)) =                    \
+            realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \
     }                                           \
     else                                        \
     {                                           \
-        (tab) = malloc( sizeof( void ** ) );    \
+        (*(void **)(&tab)) = malloc( sizeof( void ** ) );    \
     }                                           \
-    (void**)(tab)[(count)] = (void*)(p);        \
+    ((void**)(tab))[count] = (void*)(p);        \
     (count)++
 
 #define TAB_FIND( count, tab, p, index )        \
@@ -463,7 +468,7 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
         (index) = -1;                           \
         for( _i_ = 0; _i_ < (count); _i_++ )    \
         {                                       \
-            if((void**)(tab)[_i_]==(void*)(p))  \
+            if( ((void**)(tab))[_i_] == (void*)(p) )  \
             {                                   \
                 (index) = _i_;                  \
                 break;                          \
@@ -784,7 +789,8 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 
 #if defined( ENABLE_NLS ) && \
      (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main)||\
-      defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main))
+      defined(MODULE_NAME_IS_gnome2)||defined(MODULE_NAME_IS_gnome2_main)||\
+      defined(MODULE_NAME_IS_pda))
     /* Declare nothing: gnome.h will do it for us */
 #elif defined( ENABLE_NLS )
 #if defined( HAVE_INCLUDED_GETTEXT )