X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vod.h;h=f055435c316b78e4dcd8f5fa0936229c9035e3e0;hb=96b4ee1ee2da310e9ea951a29672a7609dbf831e;hp=389213a76144f61a07172c1235f8cc4de26a7417;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/include/vlc_vod.h b/include/vlc_vod.h index 389213a761..f055435c31 100644 --- a/include/vlc_vod.h +++ b/include/vlc_vod.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_vod.h: interface for VoD server modules ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2000, 2001 the VideoLAN team * $Id$ * * Author: Gildas Bazin @@ -18,7 +18,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef _VLC_VOD_H @@ -32,18 +32,18 @@ struct vod_t module_t *p_module; vod_sys_t *p_sys; - vod_media_t * (*pf_media_new) ( vod_t *, char *, input_item_t * ); + vod_media_t * (*pf_media_new) ( vod_t *, const char *, input_item_t * ); void (*pf_media_del) ( vod_t *, vod_media_t * ); int (*pf_media_add_es)( vod_t *, vod_media_t *, es_format_t * ); void (*pf_media_del_es)( vod_t *, vod_media_t *, es_format_t * ); /* Owner properties */ - int (*pf_media_control) ( void *, vod_media_t *, char *, int, va_list ); + int (*pf_media_control) ( void *, vod_media_t *, const char *, int, va_list ); void *p_data; }; static inline int vod_MediaControl( vod_t *p_vod, vod_media_t *p_media, - char *psz_id, int i_query, ... ) + const char *psz_id, int i_query, ... ) { va_list args; int i_result; @@ -59,10 +59,12 @@ static inline int vod_MediaControl( vod_t *p_vod, vod_media_t *p_media, enum vod_query_e { - VOD_MEDIA_PLAY, /* arg1= double * res= */ - VOD_MEDIA_PAUSE, /* arg1= double * res= */ - VOD_MEDIA_STOP, /* arg1= double res=can fail */ - VOD_MEDIA_SEEK, /* arg1= double * res= */ + VOD_MEDIA_PLAY, /* arg1= char * res= */ + VOD_MEDIA_PAUSE, /* arg1= res= */ + VOD_MEDIA_STOP, /* arg1= res=can fail */ + VOD_MEDIA_SEEK, /* arg1= double res= */ + VOD_MEDIA_REWIND, /* arg1= double res= */ + VOD_MEDIA_FORWARD, /* arg1= double res= */ }; #endif