X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_demux.h;h=249291427c0439edbaeb5f5fafd70d6d44340390;hb=1f79a984c2b83671f2910ba7081d9995facbcd72;hp=24b422ea6033abd4952316670597abe4d5e2a7b6;hpb=ec87e89b5950679bb48b714ebffd2ae7040b999b;p=vlc diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 24b422ea60..249291427c 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -1,24 +1,24 @@ /***************************************************************************** * vlc_demux.h: Demuxer descriptor, queries and methods ***************************************************************************** - * Copyright (C) 1999-2005 the VideoLAN team + * Copyright (C) 1999-2005 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_DEMUX_H @@ -48,7 +48,8 @@ struct demux_t /* eg informative but needed (we can have access+demux) */ char *psz_access; char *psz_demux; - char *psz_path; + char *psz_location; + char *psz_file; /* input stream */ stream_t *s; /* NULL in case of a access+demux in one */ @@ -109,7 +110,7 @@ enum demux_query_e DEMUX_SET_TITLE, /* arg1= int can fail */ DEMUX_SET_SEEKPOINT, /* arg1= int can fail */ - /* DEMUX_SET_GROUP only a hit for demuxer (mainly DVB) to allow not + /* DEMUX_SET_GROUP only a hint for demuxer (mainly DVB) to allow not * reading everything (you should not use this to call es_out_Control) * if you don't know what to do with it, just IGNORE it, it is safe(r) * -1 means all group, 0 default group (first es added) */ @@ -117,10 +118,10 @@ enum demux_query_e /* Ask the demux to demux until the given date at the next pf_demux call * but not more (and not less, at the precision available of course). - * XXX: not mandatory (except for subtitle demux) but I will help a lot + * XXX: not mandatory (except for subtitle demux) but will help a lot * for multi-input */ - DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t * can fail */ + DEMUX_SET_NEXT_DEMUX_TIME, /* arg1= int64_t can fail */ /* FPS for correct subtitles handling */ DEMUX_GET_FPS, /* arg1= double * res=can fail */ @@ -158,24 +159,33 @@ enum demux_query_e DEMUX_SET_RATE, /* arg1= int*pi_rate can fail */ DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/ + + /* Navigation */ + DEMUX_NAV_ACTIVATE, /* res=can fail */ + DEMUX_NAV_UP, /* res=can fail */ + DEMUX_NAV_DOWN, /* res=can fail */ + DEMUX_NAV_LEFT, /* res=can fail */ + DEMUX_NAV_RIGHT, /* res=can fail */ }; -VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ) ); +VLC_API int demux_vaControlHelper( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ); /************************************************************************* * Miscellaneous helpers for demuxers *************************************************************************/ -LIBVLC_USED +VLC_USED static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension ) { - const char *psz_ext = strrchr ( p_demux->psz_path, '.' ); + const char *name = (p_demux->psz_file != NULL) ? p_demux->psz_file + : p_demux->psz_location; + const char *psz_ext = strrchr ( name, '.' ); if( !psz_ext || strcasecmp( psz_ext, psz_extension ) ) return false; return true; } -LIBVLC_USED +VLC_USED static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name ) { if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) ) @@ -190,18 +200,18 @@ static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name ) * The provided es_format_t will be cleaned on error or by * demux_PacketizerDestroy. */ -VLC_EXPORT( decoder_t *,demux_PacketizerNew, ( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) LIBVLC_USED ); +VLC_API decoder_t * demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg ) VLC_USED; /** * This function will destroy a packetizer create by demux_PacketizerNew. */ -VLC_EXPORT( void, demux_PacketizerDestroy, ( decoder_t *p_packetizer ) ); +VLC_API void demux_PacketizerDestroy( decoder_t *p_packetizer ); /** * This function will return the parent input of this demux. * It is retained. Can return NULL. */ -VLC_EXPORT( input_thread_t *, demux_GetParentInput, ( demux_t *p_demux ) LIBVLC_USED ); +VLC_API input_thread_t * demux_GetParentInput( demux_t *p_demux ) VLC_USED; /* */ #define DEMUX_INIT_COMMON() do { \