X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_access.h;h=92044ebb6d5992aa025bbe7863df9fc0f07f5a09;hb=b5625a39634deaa4082b44a326614a5b79b8dc39;hp=2dae17824a374cfec5f229c126155e36ee06e896;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/include/vlc_access.h b/include/vlc_access.h index 2dae17824a..92044ebb6d 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -21,12 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif +#ifndef VLC_ACCESS_H +#define VLC_ACCESS_H 1 -#ifndef _VLC_ACCESS_H -#define _VLC_ACCESS_H 1 +/** + * \file + * This file defines functions and definitions for access object + */ #include @@ -44,15 +45,20 @@ enum access_query_e ACCESS_CAN_CONTROL_PACE,/* arg1= bool* cannot fail */ /* */ - ACCESS_GET_MTU, /* arg1= int* cannot fail(0 if no sense)*/ - ACCESS_GET_PTS_DELAY, /* arg1= int64_t* cannot fail */ + ACCESS_GET_PTS_DELAY = 0x101,/* arg1= int64_t* cannot fail */ /* */ - ACCESS_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* can fail */ + ACCESS_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* res=can fail */ /* Meta data */ - ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */ + ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */ + + /* */ + ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */ + + /* */ + ACCESS_GET_SIGNAL, /* arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ /* */ - ACCESS_SET_PAUSE_STATE, /* arg1= bool can fail */ + ACCESS_SET_PAUSE_STATE = 0x200, /* arg1= bool can fail */ /* */ ACCESS_SET_TITLE, /* arg1= int can fail */ @@ -60,11 +66,9 @@ enum access_query_e /* Special mode for access/demux communication * XXX: avoid to use it unless you can't */ - ACCESS_SET_PRIVATE_ID_STATE, /* arg1= int i_private_data, bool b_selected can fail */ - ACCESS_SET_PRIVATE_ID_CA, /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */ - ACCESS_GET_PRIVATE_ID_STATE, /* arg1=int i_private_data arg2=bool * res=can fail */ - - ACCESS_GET_CONTENT_TYPE, /* arg1=char **ppsz_content_type */ + ACCESS_SET_PRIVATE_ID_STATE = 0x1000, /* arg1= int i_private_data, bool b_selected res=can fail */ + ACCESS_SET_PRIVATE_ID_CA, /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */ + ACCESS_GET_PRIVATE_ID_STATE, /* arg1=int i_private_data arg2=bool * res=can fail */ }; struct access_t @@ -78,8 +82,6 @@ struct access_t char *psz_access; /* Access path/url/filename/.... */ char *psz_path; - /* Access source for access_filter (NULL for regular access) */ - access_t *p_source; /* Access can fill this entry to force a demuxer * XXX: fill it once you know for sure you will succeed @@ -107,42 +109,31 @@ struct access_t int64_t i_size; /* Write only for access, read only for input */ int64_t i_pos; /* idem */ - bool b_eof; /* idem */ + bool b_eof; /* idem */ int i_title; /* idem, start from 0 (could be menu) */ int i_seekpoint;/* idem, start from 0 */ - - bool b_prebuffered; /* Read only for input */ } info; access_sys_t *p_sys; }; -static inline int access2_vaControl( access_t *p_access, int i_query, va_list args ) +static inline int access_vaControl( access_t *p_access, int i_query, va_list args ) { if( !p_access ) return VLC_EGENERIC; - assert( p_access->pf_control ); return p_access->pf_control( p_access, i_query, args ); } -static inline int access2_Control( access_t *p_access, int i_query, ... ) +static inline int access_Control( access_t *p_access, int i_query, ... ) { va_list args; int i_result; va_start( args, i_query ); - i_result = access2_vaControl( p_access, i_query, args ); + i_result = access_vaControl( p_access, i_query, args ); va_end( args ); return i_result; } -static inline char *access_GetContentType( access_t *p_access ) -{ - char *res; - if( access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) ) - return NULL; - return res; -} - static inline void access_InitFields( access_t *p_a ) { p_a->info.i_update = 0; @@ -153,22 +144,22 @@ static inline void access_InitFields( access_t *p_a ) p_a->info.i_seekpoint = 0; } -#define ACCESS_SET_CALLBACKS( read, block, control, seek ) \ - p_access->pf_read = read; \ - p_access->pf_block = block; \ - p_access->pf_control = control; \ - p_access->pf_seek = seek; \ - -#define STANDARD_READ_ACCESS_INIT \ - access_InitFields( p_access ); \ - ACCESS_SET_CALLBACKS( Read, NULL, Control, Seek ); \ - MALLOC_ERR( p_access->p_sys, access_sys_t ); \ - p_sys = p_access->p_sys; memset( p_sys, 0, sizeof( access_sys_t ) ); - -#define STANDARD_BLOCK_ACCESS_INIT \ - access_InitFields( p_access ); \ - ACCESS_SET_CALLBACKS( NULL, Block, Control, Seek ); \ - MALLOC_ERR( p_access->p_sys, access_sys_t ); \ - p_sys = p_access->p_sys; memset( p_sys, 0, sizeof( access_sys_t ) ); +#define ACCESS_SET_CALLBACKS( read, block, control, seek ) \ + p_access->pf_read = read; \ + p_access->pf_block = block; \ + p_access->pf_control = control; \ + p_access->pf_seek = seek; + +#define STANDARD_READ_ACCESS_INIT \ + access_InitFields( p_access ); \ + ACCESS_SET_CALLBACKS( Read, NULL, Control, Seek ); \ + p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t )); \ + if( !p_sys ) return VLC_ENOMEM; + +#define STANDARD_BLOCK_ACCESS_INIT \ + access_InitFields( p_access ); \ + ACCESS_SET_CALLBACKS( NULL, Block, Control, Seek ); \ + p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); \ + if( !p_sys ) return VLC_ENOMEM; #endif