X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_access.h;h=567928b7f510b0632d276fbfa17c59582a6c71ce;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=dc194b6c7899045eb8c234e3c27aa4e49064c2f0;hpb=f5ba2e366da3a87471c1c998fffc2ebf82c3b94a;p=vlc diff --git a/include/vlc_access.h b/include/vlc_access.h index dc194b6c78..567928b7f5 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -45,8 +45,7 @@ enum access_query_e ACCESS_CAN_CONTROL_PACE,/* arg1= bool* cannot fail */ /* */ - ACCESS_GET_MTU = 0x100, /* 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* res=can fail */ /* Meta data */ @@ -81,10 +80,8 @@ struct access_t /* Access name (empty if non forced) */ char *psz_access; - /* Access path/url/filename/.... */ - char *psz_path; - /* Access source for access_filter (NULL for regular access) */ - access_t *p_source; + char *psz_location; /**< Location (URL with the scheme stripped) */ + char *psz_filepath; /**< Local file path (if applicable) */ /* Access can fill this entry to force a demuxer * XXX: fill it once you know for sure you will succeed @@ -98,7 +95,7 @@ struct access_t /* Called for each seek. * XXX can be null */ - int (*pf_seek) ( access_t *, int64_t ); /* can be null if can't seek */ + int (*pf_seek) ( access_t *, uint64_t ); /* can be null if can't seek */ /* Used to retreive and configure the access * XXX mandatory. look at access_query_e to know what query you *have to* support */ @@ -110,14 +107,17 @@ struct access_t unsigned int i_update; /* Access sets them on change, Input removes them once take into account*/ - int64_t i_size; /* Write only for access, read only for input */ - int64_t i_pos; /* idem */ + uint64_t i_size; /* Write only for access, read only for input */ + uint64_t i_pos; /* idem */ bool b_eof; /* idem */ int i_title; /* idem, start from 0 (could be menu) */ int i_seekpoint;/* idem, start from 0 */ } info; access_sys_t *p_sys; + + /* Weak link to parent input */ + input_thread_t *p_input; }; static inline int access_vaControl( access_t *p_access, int i_query, va_list args ) @@ -147,6 +147,12 @@ static inline void access_InitFields( access_t *p_a ) p_a->info.i_seekpoint = 0; } +/** + * This function will return the parent input of this access. + * It is retained. It can return NULL. + */ +VLC_EXPORT( input_thread_t *, access_GetParentInput, ( access_t *p_access ) LIBVLC_USED ); + #define ACCESS_SET_CALLBACKS( read, block, control, seek ) \ p_access->pf_read = read; \ p_access->pf_block = block; \ @@ -165,4 +171,8 @@ static inline void access_InitFields( access_t *p_a ) p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); \ if( !p_sys ) return VLC_ENOMEM; +/** + * @} + */ + #endif