X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vod.h;h=2c9e9516de59f9d63b79933d6d3db1d1d78afec8;hb=7cc27cb2adc88edb24c9ac2556b29421574c91c1;hp=087a73406debd5f3edbff33cc3b9315038ceecbc;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/include/vlc_vod.h b/include/vlc_vod.h index 087a73406d..2c9e9516de 100644 --- a/include/vlc_vod.h +++ b/include/vlc_vod.h @@ -18,9 +18,13 @@ * * 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. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + #ifndef _VLC_VOD_H #define _VLC_VOD_H 1 @@ -32,18 +36,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 +63,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