X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_osd.h;h=d6df9440b0e71929cb494616147f9544b65dbb80;hb=5436f7e9cb11d2027f95b18694ad4e2262e46f6d;hp=0fe9da47482dabeece3bdd2c9e791e3ee067ecd1;hpb=6f258887aa634d8cceaf9797779521dfd8340be2;p=vlc diff --git a/include/vlc_osd.h b/include/vlc_osd.h index 0fe9da4748..d6df9440b0 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -264,7 +264,7 @@ struct osd_menu_t * functions. It creates the osd_menu object and holds a pointer to it * during its lifetime. */ -VLC_API osd_menu_t * osd_MenuCreate( vlc_object_t *, const char * ) LIBVLC_USED; +VLC_API osd_menu_t * osd_MenuCreate( vlc_object_t *, const char * ) VLC_USED; /** * Delete the osd_menu_t object @@ -282,7 +282,7 @@ VLC_API void osd_MenuDelete( vlc_object_t *, osd_menu_t * ); * Find OSD Menu button at position x,y */ VLC_API osd_button_t *osd_ButtonFind( vlc_object_t *p_this, - int, int, int, int, int, int ) LIBVLC_USED; + int, int, int, int, int, int ) VLC_USED; #define osd_ButtonFind(object,x,y,h,w,sh,sw) osd_ButtonFind(object,x,y,h,w,sh,sw) @@ -377,7 +377,7 @@ VLC_API void osd_Volume( vlc_object_t * ); * Retrieve a non modifyable pointer to the OSD Menu state * */ -LIBVLC_USED +VLC_USED static inline const osd_menu_state_t *osd_GetMenuState( osd_menu_t *p_osd ) { return( p_osd->p_state ); @@ -388,7 +388,7 @@ static inline const osd_menu_state_t *osd_GetMenuState( osd_menu_t *p_osd ) * * Returns 0 when no key has been pressed or the value of the key pressed. */ -LIBVLC_USED +VLC_USED static inline bool osd_GetKeyPressed( osd_menu_t *p_osd ) { return( p_osd->p_state->b_update ); @@ -445,7 +445,7 @@ static inline void osd_SetMenuUpdate( osd_menu_t *p_osd, bool b_value ) */ VLC_API int osd_ShowTextRelative( spu_t *, int, const char *, const text_style_t *, int, int, int, mtime_t ); VLC_API int osd_ShowTextAbsolute( spu_t *, int, const char *, const text_style_t *, int, int, int, mtime_t, mtime_t ); -VLC_API void osd_Message( spu_t *, int, char *, ... ) LIBVLC_FORMAT( 3, 4 ); +VLC_API void osd_Message( spu_t *, int, char *, ... ) VLC_FORMAT( 3, 4 ); /** @} */