vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Aug 26 22:26:27 2013 +0300| [cea762697ef6afdfd291dae71887c2d27ebad18b] | committer: Rémi Denis-Courmont
access: remove info.i_(update|title|seekpoint) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cea762697ef6afdfd291dae71887c2d27ebad18b --- include/vlc_access.h | 9 --------- include/vlc_demux.h | 5 +++++ include/vlc_input.h | 6 ------ modules/access/dshow/dshow.cpp | 2 -- modules/access/rtsp/access.c | 2 -- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/include/vlc_access.h b/include/vlc_access.h index 0a1f589..8a8f1fa 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -104,14 +104,8 @@ struct access_t /* Access has to maintain them uptodate */ struct { - unsigned int i_update; /* Access sets them on change, - Input removes them once take into account*/ - 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; @@ -146,11 +140,8 @@ static inline uint64_t access_GetSize( access_t *p_access ) static inline void access_InitFields( access_t *p_a ) { - p_a->info.i_update = 0; p_a->info.i_pos = 0; p_a->info.b_eof = false; - p_a->info.i_title = 0; - p_a->info.i_seekpoint = 0; } /** diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 6bc0507..56f1dc9 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -77,6 +77,11 @@ struct demux_t input_thread_t *p_input; }; +/* demux_t.info.i_update field */ +#define INPUT_UPDATE_TITLE 0x0010 +#define INPUT_UPDATE_SEEKPOINT 0x0020 +#define INPUT_UPDATE_META 0x0040 +#define INPUT_UPDATE_TITLE_LIST 0x0100 /* demux_meta_t is returned by "meta reader" module to the demuxer */ typedef struct demux_meta_t diff --git a/include/vlc_input.h b/include/vlc_input.h index 42e1388..832c76c 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -202,12 +202,6 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a ) * input defines/constants. *****************************************************************************/ -/* i_update field of access_t/demux_t */ -#define INPUT_UPDATE_TITLE 0x0010 -#define INPUT_UPDATE_SEEKPOINT 0x0020 -#define INPUT_UPDATE_META 0x0040 -#define INPUT_UPDATE_TITLE_LIST 0x0100 - /** * This defines private core storage for an input. */ diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index e656771..83a21c3 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -814,8 +814,6 @@ static int AccessOpen( vlc_object_t *p_this ) p_access->pf_seek = NULL; p_access->info.i_pos = 0; p_access->info.b_eof = false; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; p_access->p_sys = p_sys; /* Everything is ready. Let's rock baby */ diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index 227d0a9..dd786be 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -161,8 +161,6 @@ static int Open( vlc_object_t *p_this ) p_access->pf_control = Control; p_access->info.i_pos = 0; p_access->info.b_eof = false; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); if( !p_sys ) return VLC_ENOMEM; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
