vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Aug 26 19:08:18 2013 +0300| [a025357ee0487185733834d7a57d3fc78a3c7e08] | committer: Rémi Denis-Courmont
input: add access & stream controls for current title and seekpoint > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a025357ee0487185733834d7a57d3fc78a3c7e08 --- include/vlc_access.h | 13 ++++++------- include/vlc_stream.h | 2 ++ src/input/stream.c | 4 ++++ src/input/stream_demux.c | 2 ++ src/input/stream_memory.c | 2 ++ 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/vlc_access.h b/include/vlc_access.h index c912143..0a1f589 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -47,15 +47,14 @@ enum access_query_e /* */ 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 */ - ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */ + ACCESS_GET_TITLE_INFO, /* arg1=input_title_t*** arg2=int* res=can fail */ + ACCESS_GET_TITLE, /* arg1=unsigned * res=can fail */ + ACCESS_GET_SEEKPOINT, /* arg1=unsigned * res=can fail */ - /* */ - ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */ + /* Meta data */ + 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 */ /* */ diff --git a/include/vlc_stream.h b/include/vlc_stream.h index 50a42c3..0772553 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -105,6 +105,8 @@ enum stream_query_e /* */ STREAM_GET_TITLE_INFO = 0x102, /**< arg1=input_title_t*** arg2=int* res=can fail */ + STREAM_GET_TITLE, /**< arg1=unsigned * res=can fail */ + STREAM_GET_SEEKPOINT, /**< arg1=unsigned * res=can fail */ STREAM_GET_META, /**< arg1= vlc_meta_t ** res=can fail */ STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can fail */ STREAM_GET_SIGNAL, /**< arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ diff --git a/src/input/stream.c b/src/input/stream.c index 9236f05..4e29dea 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -555,6 +555,8 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) static_control_match(CAN_PAUSE); static_control_match(CAN_CONTROL_PACE); static_control_match(GET_TITLE_INFO); + static_control_match(GET_TITLE); + static_control_match(GET_SEEKPOINT); static_control_match(GET_META); static_control_match(GET_CONTENT_TYPE); static_control_match(GET_SIGNAL); @@ -572,6 +574,8 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) case STREAM_CAN_PAUSE: case STREAM_CAN_CONTROL_PACE: case STREAM_GET_TITLE_INFO: + case STREAM_GET_TITLE: + case STREAM_GET_SEEKPOINT: case STREAM_GET_META: case STREAM_GET_CONTENT_TYPE: case STREAM_GET_SIGNAL: diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c index fbfa2d0..ad3e973 100644 --- a/src/input/stream_demux.c +++ b/src/input/stream_demux.c @@ -297,6 +297,8 @@ static int DStreamControl( stream_t *s, int i_query, va_list args ) } case STREAM_GET_TITLE_INFO: + case STREAM_GET_TITLE: + case STREAM_GET_SEEKPOINT: case STREAM_GET_META: case STREAM_GET_CONTENT_TYPE: case STREAM_GET_SIGNAL: diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c index daefe30..ef3025b 100644 --- a/src/input/stream_memory.c +++ b/src/input/stream_memory.c @@ -123,6 +123,8 @@ static int Control( stream_t *s, int i_query, va_list args ) break; case STREAM_GET_TITLE_INFO: + case STREAM_GET_TITLE: + case STREAM_GET_SEEKPOINT: case STREAM_GET_META: case STREAM_GET_CONTENT_TYPE: case STREAM_GET_SIGNAL: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
