From f8f8faa6a6655200f76031eb23595be0e7a63b6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 7 Feb 2010 13:05:27 +0200 Subject: [PATCH] OSD: remoev leading underscores --- include/vlc_osd.h | 59 ++++++++++++++--------------- src/libvlccore.sym | 28 +++++++------- src/osd/osd.c | 42 ++++++++++++-------- src/video_output/video_text.c | 6 +-- src/video_output/vout_subpictures.c | 4 +- 5 files changed, 75 insertions(+), 64 deletions(-) diff --git a/include/vlc_osd.h b/include/vlc_osd.h index d327fa16a7..ec80d07f69 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -96,8 +96,8 @@ static inline int spu_Control( spu_t *p_spu, int i_query, ... ) return i_result; } -#define spu_Create(a) __spu_Create(VLC_OBJECT(a)) -VLC_EXPORT( spu_t *, __spu_Create, ( vlc_object_t * ) ); +VLC_EXPORT( spu_t *, spu_Create, ( vlc_object_t * ) ); +#define spu_Create(a) spu_Create(VLC_OBJECT(a)) VLC_EXPORT( int, spu_Init, ( spu_t * ) ); VLC_EXPORT( void, spu_Destroy, ( spu_t * ) ); void spu_Attach( spu_t *, vlc_object_t *, bool ); @@ -433,7 +433,7 @@ struct osd_menu_t * functions. It creates the osd_menu object and holds a pointer to it * during its lifetime. */ -VLC_EXPORT( osd_menu_t *, __osd_MenuCreate, ( vlc_object_t *, const char * ) ); +VLC_EXPORT( osd_menu_t *, osd_MenuCreate, ( vlc_object_t *, const char * ) ); /** * Delete the osd_menu_t object @@ -442,25 +442,25 @@ VLC_EXPORT( osd_menu_t *, __osd_MenuCreate, ( vlc_object_t *, const char * ) ); * memory for the osdmenu. After return of this function the pointer to * osd_menu_t* is invalid. */ -VLC_EXPORT( void, __osd_MenuDelete, ( vlc_object_t *, osd_menu_t * ) ); +VLC_EXPORT( void, osd_MenuDelete, ( vlc_object_t *, osd_menu_t * ) ); -#define osd_MenuCreate(object,file) __osd_MenuCreate( VLC_OBJECT(object), file ) -#define osd_MenuDelete(object,osd) __osd_MenuDelete( VLC_OBJECT(object), osd ) +#define osd_MenuCreate(object,file) osd_MenuCreate( VLC_OBJECT(object), file ) +#define osd_MenuDelete(object,osd) osd_MenuDelete( VLC_OBJECT(object), osd ) /** * Find OSD Menu button at position x,y */ -VLC_EXPORT( osd_button_t *, __osd_ButtonFind, ( vlc_object_t *p_this, +VLC_EXPORT( osd_button_t *, osd_ButtonFind, ( vlc_object_t *p_this, int, int, int, int, int, int ) ); -#define osd_ButtonFind(object,x,y,h,w,sh,sw) __osd_ButtonFind(object,x,y,h,w,sh,sw) +#define osd_ButtonFind(object,x,y,h,w,sh,sw) osd_ButtonFind(object,x,y,h,w,sh,sw) /** * Select the button provided as the new active button */ -VLC_EXPORT( void, __osd_ButtonSelect, ( vlc_object_t *, osd_button_t *) ); +VLC_EXPORT( void, osd_ButtonSelect, ( vlc_object_t *, osd_button_t *) ); -#define osd_ButtonSelect(object,button) __osd_ButtonSelect(object,button) +#define osd_ButtonSelect(object,button) osd_ButtonSelect(object,button) /** * Show the OSD menu. @@ -469,14 +469,14 @@ VLC_EXPORT( void, __osd_ButtonSelect, ( vlc_object_t *, osd_button_t *) ); * Every change to the OSD menu will now be visible in the output. An output * can be a video output window or a stream (\see stream output) */ -VLC_EXPORT( void, __osd_MenuShow, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuShow, ( vlc_object_t * ) ); /** * Hide the OSD menu. * * Stop showing the OSD menu on the video output or mux it into the stream. */ -VLC_EXPORT( void, __osd_MenuHide, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuHide, ( vlc_object_t * ) ); /** * Activate the action of this OSD menu item. @@ -485,11 +485,11 @@ VLC_EXPORT( void, __osd_MenuHide, ( vlc_object_t * ) ); * hotkey action to the hotkey interface. The hotkey that belongs to * the current highlighted OSD menu item will be used. */ -VLC_EXPORT( void, __osd_MenuActivate, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuActivate, ( vlc_object_t * ) ); -#define osd_MenuShow(object) __osd_MenuShow( VLC_OBJECT(object) ) -#define osd_MenuHide(object) __osd_MenuHide( VLC_OBJECT(object) ) -#define osd_MenuActivate(object) __osd_MenuActivate( VLC_OBJECT(object) ) +#define osd_MenuShow(object) osd_MenuShow( VLC_OBJECT(object) ) +#define osd_MenuHide(object) osd_MenuHide( VLC_OBJECT(object) ) +#define osd_MenuActivate(object) osd_MenuActivate( VLC_OBJECT(object) ) /** * Next OSD menu item @@ -498,7 +498,7 @@ VLC_EXPORT( void, __osd_MenuActivate, ( vlc_object_t * ) ); * Note: The actual position on screen of the menu item is determined by * the OSD menu configuration file. */ -VLC_EXPORT( void, __osd_MenuNext, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuNext, ( vlc_object_t * ) ); /** * Previous OSD menu item @@ -507,7 +507,7 @@ VLC_EXPORT( void, __osd_MenuNext, ( vlc_object_t * ) ); * Note: The actual position on screen of the menu item is determined by * the OSD menu configuration file. */ -VLC_EXPORT( void, __osd_MenuPrev, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuPrev, ( vlc_object_t * ) ); /** * OSD menu item above @@ -516,7 +516,7 @@ VLC_EXPORT( void, __osd_MenuPrev, ( vlc_object_t * ) ); * Note: The actual position on screen of the menu item is determined by * the OSD menu configuration file. */ -VLC_EXPORT( void, __osd_MenuUp, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuUp, ( vlc_object_t * ) ); /** * OSD menu item below @@ -525,12 +525,12 @@ VLC_EXPORT( void, __osd_MenuUp, ( vlc_object_t * ) ); * Note: The actual position on screen of the menu item is determined by * the OSD menu configuration file. */ -VLC_EXPORT( void, __osd_MenuDown, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_MenuDown, ( vlc_object_t * ) ); -#define osd_MenuNext(object) __osd_MenuNext( VLC_OBJECT(object) ) -#define osd_MenuPrev(object) __osd_MenuPrev( VLC_OBJECT(object) ) -#define osd_MenuUp(object) __osd_MenuUp( VLC_OBJECT(object) ) -#define osd_MenuDown(object) __osd_MenuDown( VLC_OBJECT(object) ) +#define osd_MenuNext(object) osd_MenuNext( VLC_OBJECT(object) ) +#define osd_MenuPrev(object) osd_MenuPrev( VLC_OBJECT(object) ) +#define osd_MenuUp(object) osd_MenuUp( VLC_OBJECT(object) ) +#define osd_MenuDown(object) osd_MenuDown( VLC_OBJECT(object) ) /** * Display the audio volume bitmap. @@ -538,9 +538,9 @@ VLC_EXPORT( void, __osd_MenuDown, ( vlc_object_t * ) ); * Display the correct audio volume bitmap that corresponds to the * current Audio Volume setting. */ -VLC_EXPORT( void, __osd_Volume, ( vlc_object_t * ) ); +VLC_EXPORT( void, osd_Volume, ( vlc_object_t * ) ); -#define osd_Volume(object) __osd_Volume( VLC_OBJECT(object) ) +#define osd_Volume(object) osd_Volume( VLC_OBJECT(object) ) /** * Retrieve a non modifyable pointer to the OSD Menu state @@ -644,13 +644,10 @@ VLC_EXPORT( int, vout_OSDEpg, ( vout_thread_t *, input_item_t * ) ); * \param i_channel Subpicture channel * \param psz_format printf style formatting **/ -VLC_EXPORT( void, __vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) LIBVLC_FORMAT( 3, 4 ) ); +VLC_EXPORT( void, vout_OSDMessage, ( vlc_object_t *, int, const char *, ... ) LIBVLC_FORMAT( 3, 4 ) ); -/** - * Same as __vlc_OSDMessage() but with automatic casting - */ #define vout_OSDMessage( obj, chan, ...) \ - __vout_OSDMessage( VLC_OBJECT(obj), chan, __VA_ARGS__ ) + vout_OSDMessage( VLC_OBJECT(obj), chan, __VA_ARGS__ ) /** * Display a slider on the video output. diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 46f256c27b..bd3121e02f 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -275,23 +275,23 @@ net_SetCSCov net_vaPrintf net_Write NTPtime64 -__osd_ButtonFind -__osd_ButtonSelect +osd_ButtonFind +osd_ButtonSelect osd_Icon -__osd_MenuActivate -__osd_MenuCreate -__osd_MenuDelete -__osd_MenuDown -__osd_MenuHide -__osd_MenuNext -__osd_MenuPrev -__osd_MenuShow -__osd_MenuUp +osd_MenuActivate +osd_MenuCreate +osd_MenuDelete +osd_MenuDown +osd_MenuHide +osd_MenuNext +osd_MenuPrev +osd_MenuShow +osd_MenuUp osd_Message osd_ShowTextAbsolute osd_ShowTextRelative osd_Slider -__osd_Volume +osd_Volume path_sanitize picture_CopyPixels picture_Delete @@ -379,7 +379,7 @@ sout_SAPMethod sout_StreamChainDelete sout_StreamChainNew sout_UpdateStatistic -__spu_Create +spu_Create spu_Destroy spu_DisplaySubpicture spu_Init @@ -607,7 +607,7 @@ vout_GetSnapshot vout_GetSpu vout_LinkPicture vout_OSDIcon -__vout_OSDMessage +vout_OSDMessage vout_OSDEpg vout_OSDSlider vout_PlacePicture diff --git a/src/osd/osd.c b/src/osd/osd.c index 0a53bd4b9a..4041c6ef8a 100644 --- a/src/osd/osd.c +++ b/src/osd/osd.c @@ -137,10 +137,11 @@ static osd_state_t *osd_StateChange( osd_button_t *p_button, const int i_state ) return p_button->p_states; } +#undef osd_MenuCreate /***************************************************************************** * OSD menu Funtions *****************************************************************************/ -osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) +osd_menu_t *osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) { osd_menu_t *p_osd = NULL; vlc_value_t val; @@ -209,11 +210,12 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) error: vlc_mutex_unlock( p_lock ); - __osd_MenuDelete( p_this, p_osd ); + osd_MenuDelete( p_this, p_osd ); return NULL; } -void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd ) +#undef osd_MenuDelete +void osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd ) { vlc_mutex_t *p_lock; @@ -277,7 +279,8 @@ static void osd_UpdateState( osd_menu_state_t *p_state, int i_x, int i_y, p_state->p_pic = p_pic; } -void __osd_MenuShow( vlc_object_t *p_this ) +#undef osd_MenuShow +void osd_MenuShow( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -318,7 +321,8 @@ void __osd_MenuShow( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuHide( vlc_object_t *p_this ) +#undef osd_MenuHide +void osd_MenuHide( vlc_object_t *p_this ) { osd_menu_t *p_osd; vlc_mutex_t *p_lock = osd_GetMutex( p_this ); @@ -344,7 +348,8 @@ void __osd_MenuHide( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuActivate( vlc_object_t *p_this ) +#undef osd_MenuActivate +void osd_MenuActivate( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -370,13 +375,13 @@ void __osd_MenuActivate( vlc_object_t *p_this ) if( p_button && p_button->p_up ) { vlc_mutex_unlock( p_lock ); - __osd_MenuUp( p_this ); /* "menu select" means go to menu item above. */ + osd_MenuUp( p_this ); /* "menu select" means go to menu item above. */ return; } if( p_button && p_button->p_down ) { vlc_mutex_unlock( p_lock ); - __osd_MenuDown( p_this ); /* "menu select" means go to menu item below. */ + osd_MenuDown( p_this ); /* "menu select" means go to menu item below. */ return; } @@ -401,7 +406,8 @@ void __osd_MenuActivate( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuNext( vlc_object_t *p_this ) +#undef osd_MenuNext +void osd_MenuNext( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -445,7 +451,8 @@ void __osd_MenuNext( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuPrev( vlc_object_t *p_this ) +#undef osd_MenuPrev +void osd_MenuPrev( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -488,7 +495,8 @@ void __osd_MenuPrev( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuUp( vlc_object_t *p_this ) +#undef osd_MenuUp +void osd_MenuUp( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -553,7 +561,8 @@ void __osd_MenuUp( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -void __osd_MenuDown( vlc_object_t *p_this ) +#undef osd_MenuDown +void osd_MenuDown( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -628,13 +637,14 @@ static int osd_VolumeStep( vlc_object_t *p_this, int i_volume, int i_steps ) return (i_volume/i_volume_step); } +#undef osd_Volume /** * Display current audio volume bitmap * * The OSD Menu audio volume bar is updated to reflect the new audio volume. Call this function * when the audio volume is updated outside the OSD menu command "menu up", "menu down" or "menu select". */ -void __osd_Volume( vlc_object_t *p_this ) +void osd_Volume( vlc_object_t *p_this ) { osd_menu_t *p_osd; osd_button_t *p_button = NULL; @@ -677,7 +687,8 @@ void __osd_Volume( vlc_object_t *p_this ) vlc_mutex_unlock( p_lock ); } -osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y, +#undef osd_ButtonFind +osd_button_t *osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y, int i_window_height, int i_window_width, int i_scale_width, int i_scale_height ) { @@ -750,10 +761,11 @@ osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y, return NULL; } +#undef osd_ButtonSelect /** * Select the button provided as the new active button */ -void __osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button ) +void osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button ) { osd_menu_t *p_osd; osd_button_t *p_old; diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 46c0ebe86a..ef522ef0c2 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -115,7 +115,7 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel, return VLC_SUCCESS; } - +#undef vout_OSDMessage /** * \brief Write an informative message at the default location, * for the default duration and only if the OSD option is enabled. @@ -123,8 +123,8 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel, * \param i_channel Subpicture channel * \param psz_format printf style formatting **/ -void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel, - const char *psz_format, ... ) +void vout_OSDMessage( vlc_object_t *p_caller, int i_channel, + const char *psz_format, ... ) { vout_thread_t *p_vout; char *psz_string = NULL; diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 9fecf2c8be..11a1fd87d0 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -184,12 +184,14 @@ static void FilterRelease( filter_t *p_filter ); /***************************************************************************** * Public API *****************************************************************************/ + +#undef spu_Create /** * Creates the subpicture unit * * \param p_this the parent object which creates the subpicture unit */ -spu_t *__spu_Create( vlc_object_t *p_this ) +spu_t *spu_Create( vlc_object_t *p_this ) { spu_t *p_spu; spu_private_t *p_sys; -- 2.39.5