* all: remove sout_format_t and use es_format_t instead.

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index d0b33762e7a4ae0cfc6de683a3dfb1457dea9803..50997146f37a3612e2c08aef4397c724d63cd567 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.77 2003/09/12 18:34:44 fenrir Exp $
+ * $Id: vlc_common.h,v 1.88 2003/11/21 15:32:08 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -24,6 +24,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+/**
+ * \file
+ * This file is a collection of common definitions and types
+ */
+
 /*****************************************************************************
  * Required vlc headers
  *****************************************************************************/
@@ -46,6 +51,7 @@
 /*****************************************************************************
  * Required system headers
  *****************************************************************************/
+#include <stdlib.h>
 #include <stdarg.h>
 
 #ifdef HAVE_STRING_H
@@ -108,7 +114,7 @@ typedef int                 ptrdiff_t;
 #define PATH_MAX MAX_PATH
 #endif
 
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if (defined( WIN32 ) || defined( UNDER_CE )) && !defined( _SSIZE_T_ )
 typedef int                 ssize_t;
 #endif
 
@@ -128,22 +134,6 @@ typedef uint16_t            audio_volume_t;
 typedef int                 socklen_t;
 #endif
 
-/*****************************************************************************
- * Old types definitions
- *****************************************************************************
- * We still provide these types because most of the VLC code uses them
- * instead of the C9x types. They should be removed when the transition is
- * complete (probably in 10 years).
- *****************************************************************************/
-typedef uint8_t    u8;
-typedef int8_t     s8;
-typedef uint16_t   u16;
-typedef int16_t    s16;
-typedef uint32_t   u32;
-typedef int32_t    s32;
-typedef uint64_t   u64;
-typedef int64_t    s64;
-
 /*****************************************************************************
  * mtime_t: high precision date or time interval
  *****************************************************************************
@@ -195,6 +185,7 @@ typedef struct msg_subscription_t msg_subscription_t;
 /* Playlist */
 typedef struct playlist_t playlist_t;
 typedef struct playlist_item_t playlist_item_t;
+typedef struct playlist_group_t playlist_group_t;
 
 /* Modules */
 typedef struct module_bank_t module_bank_t;
@@ -211,7 +202,7 @@ typedef struct intf_channel_t intf_channel_t;
 
 /* Input */
 typedef struct input_thread_t input_thread_t;
-typedef struct input_channel_t input_channel_t;
+typedef struct input_thread_sys_t input_thread_sys_t;
 typedef struct input_area_t input_area_t;
 typedef struct input_buffers_t input_buffers_t;
 typedef struct input_socket_t input_socket_t;
@@ -226,6 +217,12 @@ typedef struct pgrm_sys_t pgrm_sys_t;
 typedef struct stream_descriptor_t stream_descriptor_t;
 typedef struct stream_sys_t stream_sys_t;
 
+/* Format */
+typedef struct audio_format_t audio_format_t;
+typedef struct video_format_t video_format_t;
+typedef struct subs_format_t subs_format_t;
+typedef struct es_format_t  es_format_t;
+
 /* NInput */
 typedef struct stream_t stream_t;
 typedef struct es_out_t     es_out_t;
@@ -239,14 +236,15 @@ 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 aout_buffer_t aout_buffer_t;
-typedef struct audio_sample_format_t audio_sample_format_t;
+typedef audio_format_t audio_sample_format_t;
 typedef struct audio_date_t audio_date_t;
+typedef struct aout_filter_t aout_filter_t;
 
 /* Video */
 typedef struct vout_thread_t vout_thread_t;
-typedef struct vout_font_t vout_font_t;
 typedef struct vout_sys_t vout_sys_t;
 typedef struct chroma_sys_t chroma_sys_t;
+typedef video_format_t video_frame_format_t;
 typedef struct picture_t picture_t;
 typedef struct picture_sys_t picture_sys_t;
 typedef struct picture_heap_t picture_heap_t;
@@ -266,7 +264,6 @@ typedef struct sout_access_out_t sout_access_out_t;
 typedef struct sout_mux_t sout_mux_t;
 typedef struct sout_stream_t    sout_stream_t;
 typedef struct sout_cfg_t       sout_cfg_t;
-typedef struct sout_format_t    sout_format_t;
 /*typedef struct sap_session_t    sap_session_t;
 typedef struct slp_session_t    slp_session_t;*/
 
@@ -275,6 +272,10 @@ typedef struct decoder_fifo_t decoder_fifo_t;
 typedef struct decoder_t      decoder_t;
 typedef struct decoder_sys_t  decoder_sys_t;
 
+/* Encoders */
+typedef struct encoder_t      encoder_t;
+typedef struct encoder_sys_t  encoder_sys_t;
+
 /* Misc */
 typedef struct data_packet_t data_packet_t;
 typedef struct data_buffer_t data_buffer_t;
@@ -758,6 +759,10 @@ typedef __int64 off_t;
 #   define vlc_lseek NULL
 #endif
 
+/* vlc_wraptext (defined in src/extras/libc.c) */
+#define wraptext vlc_wraptext
+VLC_EXPORT( char *, vlc_wraptext, ( const char *, int, vlc_bool_t ) );
+
 /*****************************************************************************
  * CPU capabilities
  *****************************************************************************/