X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_common.h;h=0921ae44c6a61235b504df5f40df17deeee214b2;hb=b76d7cf6283749d91448cb2b175f7cd9889fbe02;hp=798dd13406d1c8af4c29609c58183c1c9583cfa0;hpb=2851705c32f14a69dcf115859481f0e4267d9ac2;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index 798dd13406..0921ae44c6 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -21,7 +21,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -205,6 +205,7 @@ typedef struct date_t date_t; /* Messages */ typedef struct msg_bank_t msg_bank_t; +typedef struct msg_queue_t msg_queue_t; typedef struct msg_subscription_t msg_subscription_t; /* Playlist */ @@ -223,7 +224,7 @@ typedef enum { PLAYLIST_STOP, /**< No arg res=can fail*/ PLAYLIST_SKIP, /**< arg1=int, res=can fail*/ PLAYLIST_GOTO, /**< arg1=int res=can fail */ - PLAYLIST_VIEWGOTO, /**< arg1=int res=can fail */ + PLAYLIST_VIEWGOTO /**< arg1=int res=can fail */ } playlist_command_t; @@ -250,22 +251,24 @@ typedef struct intf_thread_t intf_thread_t; typedef struct intf_sys_t intf_sys_t; typedef struct intf_console_t intf_console_t; typedef struct intf_msg_t intf_msg_t; -typedef struct intf_channel_t intf_channel_t; +typedef struct interaction_t interaction_t; +typedef struct interaction_dialog_t interaction_dialog_t; +typedef struct user_widget_t user_widget_t; /* Input */ typedef struct input_thread_t input_thread_t; typedef struct input_thread_sys_t input_thread_sys_t; typedef struct input_item_t input_item_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; +typedef struct access_t access_t; 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_sys_t demux_sys_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 es_descriptor_t es_descriptor_t; -typedef struct es_sys_t es_sys_t; -typedef struct pgrm_descriptor_t pgrm_descriptor_t; -typedef struct pgrm_sys_t pgrm_sys_t; -typedef struct stream_descriptor_t stream_descriptor_t; typedef struct seekpoint_t seekpoint_t; typedef struct info_t info_t; typedef struct info_category_t info_category_t; @@ -277,15 +280,6 @@ typedef struct subs_format_t subs_format_t; typedef struct es_format_t es_format_t; typedef struct video_palette_t video_palette_t; -/* NInput */ -typedef struct stream_sys_t stream_sys_t; -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; -typedef struct access_t access_t; - /* Audio */ typedef struct aout_instance_t aout_instance_t; typedef struct aout_sys_t aout_sys_t; @@ -307,6 +301,7 @@ typedef struct picture_t picture_t; typedef struct picture_sys_t picture_sys_t; typedef struct picture_heap_t picture_heap_t; +/* Subpictures */ typedef struct spu_t spu_t; typedef struct subpicture_t subpicture_t; typedef struct subpicture_sys_t subpicture_sys_t; @@ -338,7 +333,6 @@ typedef struct session_descriptor_t session_descriptor_t; typedef struct announce_method_t announce_method_t; typedef struct announce_handler_t announce_handler_t; typedef struct sap_handler_t sap_handler_t; -//typedef struct slp_session_t slp_session_t; /* Decoders */ typedef struct decoder_t decoder_t; @@ -352,18 +346,16 @@ typedef struct encoder_sys_t encoder_sys_t; typedef struct filter_t filter_t; typedef struct filter_sys_t filter_sys_t; -/* Misc */ -typedef struct data_packet_t data_packet_t; -typedef struct data_buffer_t data_buffer_t; -typedef struct stream_ctrl_t stream_ctrl_t; -typedef struct pes_packet_t pes_packet_t; +/* Network */ typedef struct network_socket_t network_socket_t; typedef struct virtual_socket_t v_socket_t; -typedef struct iso639_lang_t iso639_lang_t; typedef struct sockaddr sockaddr; typedef struct addrinfo addrinfo; typedef struct vlc_acl_t vlc_acl_t; +/* Misc */ +typedef struct iso639_lang_t iso639_lang_t; + /* block */ typedef struct block_t block_t; typedef struct block_fifo_t block_fifo_t; @@ -378,7 +370,10 @@ typedef struct httpd_message_t httpd_message_t; typedef int (*httpd_callback_t)( httpd_callback_sys_t *, httpd_client_t *, httpd_message_t *answer, 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 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 *, uint8_t *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; @@ -421,6 +416,12 @@ typedef struct vlm_schedule_t vlm_schedule_t; /* divers */ typedef struct vlc_meta_t vlc_meta_t; +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; +typedef struct global_stats_t global_stats_t; + /***************************************************************************** * Variable callbacks @@ -471,6 +472,10 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ char *psz_object_type; \ char *psz_object_name; \ \ + /* Messages header */ \ + char *psz_header; \ + int i_flags; \ + \ /* Thread properties, if any */ \ vlc_bool_t b_thread; \ vlc_thread_t thread_id; \ @@ -543,7 +548,7 @@ static int64_t GCD( int64_t a, int64_t b ) } /* Dynamic array handling: realloc array, move data, increment position */ -#if defined( _MSC_VER ) && _MSC_VER < 1300 +#if defined( _MSC_VER ) && _MSC_VER < 1300 && !defined( UNDER_CE ) # define VLCCVP (void**) /* Work-around for broken compiler */ #else # define VLCCVP @@ -791,14 +796,14 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) # define vlc_strdup NULL #endif -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) +#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(SYS_DARWIN) || defined(SYS_BEOS) +#if !defined(HAVE_ASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS) # define asprintf vlc_asprintf VLC_EXPORT( int, vlc_asprintf, (char **, const char *, ... ) ); #elif !defined(__PLUGIN__) @@ -932,6 +937,10 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) # endif #endif + VLC_EXPORT( void *, vlc_opendir_wrapper, ( const char * ) ); + VLC_EXPORT( struct dirent *, vlc_readdir_wrapper, ( void * ) ); + VLC_EXPORT( int, vlc_closedir_wrapper, ( void * ) ); + /* Format type specifiers for 64 bits numbers */ #if defined(__CYGWIN32__) || (!defined(WIN32) && !defined(UNDER_CE)) # if defined(__WORDSIZE) && __WORDSIZE == 64 @@ -987,8 +996,8 @@ static inline void _SetQWBE( uint8_t *p, uint64_t i_qw ) /* several type definitions */ # if defined( __MINGW32__ ) # if !defined( _OFF_T_ ) -typedef long long _off_t; -typedef _off_t off_t; + typedef long long _off_t; + typedef _off_t off_t; # define _OFF_T_ # else # ifdef off_t @@ -998,17 +1007,15 @@ typedef _off_t off_t; # endif # endif -/* -# if (defined( _MSC_VER ) && (!defined(__WXMSW__))) +# if defined( _MSC_VER ) && !defined( __WXMSW__ ) # if !defined( _OFF_T_DEFINED ) -typedef __int64 off_t; + typedef __int64 off_t; # define _OFF_T_DEFINED # else + /* for wx compatibility typedef long off_t; */ # define off_t __int64 - // for wx compatibility typedef long off_t; # endif # endif -*/ # if defined( __BORLANDC__ ) # undef off_t @@ -1047,6 +1054,10 @@ VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) ); VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, char **, size_t *, char **, size_t * ) ); VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); +/* execve wrapper (defined in src/extras/libc.c) */ +VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char **pp_argv, char **pp_env, char *psz_cwd, char *p_in, int i_in, char **pp_data, int *pi_data ) ); +#define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i) + /***************************************************************************** * CPU capabilities *****************************************************************************/ @@ -1090,7 +1101,6 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) ); * libvlc features *****************************************************************************/ VLC_EXPORT( const char *, VLC_Version, ( void ) ); -VLC_EXPORT( const char *, VLC_CompileTime, ( void ) ); VLC_EXPORT( const char *, VLC_CompileBy, ( void ) ); VLC_EXPORT( const char *, VLC_CompileHost, ( void ) ); VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );