enum access_query_e
{
/* capabilities */
- ACCESS_CAN_SEEK, /* arg1= vlc_bool_t* cannot fail */
- ACCESS_CAN_FASTSEEK, /* arg1= vlc_bool_t* cannot fail */
- ACCESS_CAN_PAUSE, /* arg1= vlc_bool_t* cannot fail */
- ACCESS_CAN_CONTROL_PACE,/* arg1= vlc_bool_t* cannot fail */
+ ACCESS_CAN_SEEK, /* arg1= bool* cannot fail */
+ ACCESS_CAN_FASTSEEK, /* arg1= bool* cannot fail */
+ ACCESS_CAN_PAUSE, /* arg1= bool* cannot fail */
+ ACCESS_CAN_CONTROL_PACE,/* arg1= bool* cannot fail */
/* */
ACCESS_GET_MTU, /* arg1= int* cannot fail(0 if no sense)*/
ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */
/* */
- ACCESS_SET_PAUSE_STATE, /* arg1= vlc_bool_t can fail */
+ ACCESS_SET_PAUSE_STATE, /* arg1= bool can fail */
/* */
ACCESS_SET_TITLE, /* arg1= int can fail */
/* 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, vlc_bool_t b_selected can fail */
+ 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=vlc_bool_t * res=can fail */
+ ACCESS_GET_PRIVATE_ID_STATE, /* arg1=int i_private_data arg2=bool * res=can fail */
+
+ ACCESS_GET_CONTENT_TYPE, /* arg1=char **ppsz_content_type */
};
struct access_t
/* pf_read/pf_block is used to read data.
* XXX A access should set one and only one of them */
- int (*pf_read) ( access_t *, uint8_t *, int ); /* Return -1 if no data yet, 0 if no more data, else real data read */
+ ssize_t (*pf_read) ( access_t *, uint8_t *, size_t ); /* Return -1 if no data yet, 0 if no more data, else real data read */
block_t *(*pf_block)( access_t * ); /* return a block of data in his 'natural' size, NULL if not yet data or eof */
/* Called for each seek.
int64_t i_size; /* Write only for access, read only for input */
int64_t i_pos; /* idem */
- vlc_bool_t b_eof; /* idem */
+ bool b_eof; /* idem */
int i_title; /* idem, start from 0 (could be menu) */
int i_seekpoint;/* idem, start from 0 */
- vlc_bool_t b_prebuffered; /* Read only for input */
+ 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;
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( access_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;
p_a->info.i_size = 0;
p_a->info.i_pos = 0;
- p_a->info.b_eof = VLC_FALSE;
+ p_a->info.b_eof = false;
p_a->info.i_title = 0;
p_a->info.i_seekpoint = 0;
}