From: Rémi Duraffort Date: Sun, 1 Aug 2010 20:29:29 +0000 (+0200) Subject: includes: add some LIBVLC_USED. X-Git-Tag: 1.2.0-pre1~5569 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=502a2fa8050ae47d34c5635dd0f6ee6fd4ce8242 includes: add some LIBVLC_USED. --- diff --git a/include/vlc_osd.h b/include/vlc_osd.h index 82aea94f50..06168b4b8f 100644 --- a/include/vlc_osd.h +++ b/include/vlc_osd.h @@ -265,7 +265,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 * ) LIBVLC_USED ); /** * Delete the osd_menu_t object @@ -283,7 +283,7 @@ VLC_EXPORT( void, osd_MenuDelete, ( vlc_object_t *, osd_menu_t * ) ); * Find OSD Menu button at position x,y */ VLC_EXPORT( osd_button_t *, osd_ButtonFind, ( vlc_object_t *p_this, - int, int, int, int, int, int ) ); + int, int, int, int, int, int ) LIBVLC_USED ); #define osd_ButtonFind(object,x,y,h,w,sh,sw) osd_ButtonFind(object,x,y,h,w,sh,sw) @@ -378,6 +378,7 @@ VLC_EXPORT( void, osd_Volume, ( vlc_object_t * ) ); * Retrieve a non modifyable pointer to the OSD Menu state * */ +LIBVLC_USED static inline const osd_menu_state_t *osd_GetMenuState( osd_menu_t *p_osd ) { return( p_osd->p_state ); @@ -388,6 +389,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 static inline bool osd_GetKeyPressed( osd_menu_t *p_osd ) { return( p_osd->p_state->b_update ); diff --git a/include/vlc_picture.h b/include/vlc_picture.h index 9a524dcc45..b0fe6e4d7a 100644 --- a/include/vlc_picture.h +++ b/include/vlc_picture.h @@ -114,7 +114,7 @@ struct picture_t * with picture_Hold and picture_Release. This default management will release * p_sys, p_q, p_data_orig fields if non NULL. */ -VLC_EXPORT( picture_t *, picture_New, ( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) ); +VLC_EXPORT( picture_t *, picture_New, ( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) LIBVLC_USED ); /** * This function will create a new picture using the given format. @@ -122,7 +122,7 @@ VLC_EXPORT( picture_t *, picture_New, ( vlc_fourcc_t i_chroma, int i_width, int * When possible, it is preferred to use this function over picture_New * as more information about the format is kept. */ -VLC_EXPORT( picture_t *, picture_NewFromFormat, ( const video_format_t *p_fmt ) ); +VLC_EXPORT( picture_t *, picture_NewFromFormat, ( const video_format_t *p_fmt ) LIBVLC_USED ); /** * Resource for a picture. @@ -148,7 +148,7 @@ typedef struct * * If the resource is NULL then a plain picture_NewFromFormat is returned. */ -VLC_EXPORT( picture_t *, picture_NewFromResource, ( const video_format_t *, const picture_resource_t * ) ); +VLC_EXPORT( picture_t *, picture_NewFromResource, ( const video_format_t *, const picture_resource_t * ) LIBVLC_USED ); /** * This function will force the destruction a picture. diff --git a/include/vlc_picture_pool.h b/include/vlc_picture_pool.h index 83a5728e53..d22dbed8e9 100644 --- a/include/vlc_picture_pool.h +++ b/include/vlc_picture_pool.h @@ -62,21 +62,21 @@ typedef struct { * as soon as a picture is unused. They are allowed to modify picture_t::p and * access picture_t::p_sys. */ -VLC_EXPORT( picture_pool_t *, picture_pool_NewExtended, ( const picture_pool_configuration_t * ) ); +VLC_EXPORT( picture_pool_t *, picture_pool_NewExtended, ( const picture_pool_configuration_t * ) LIBVLC_USED ); /** * It creates a picture_pool_t wrapping the given arrays of picture. * * It is provided as convenience. */ -VLC_EXPORT( picture_pool_t *, picture_pool_New, ( int picture_count, picture_t *picture[] ) ); +VLC_EXPORT( picture_pool_t *, picture_pool_New, ( int picture_count, picture_t *picture[] ) LIBVLC_USED ); /** * It creates a picture_pool_t creating images using the given format. * * Provided for convenience. */ -VLC_EXPORT( picture_pool_t *, picture_pool_NewFromFormat, ( const video_format_t *, int picture_count ) ); +VLC_EXPORT( picture_pool_t *, picture_pool_NewFromFormat, ( const video_format_t *, int picture_count ) LIBVLC_USED ); /** * It destroys a pool created by picture_pool_New. @@ -91,7 +91,7 @@ VLC_EXPORT( void, picture_pool_Delete, ( picture_pool_t * ) ); * * The picture must be release by using picture_Release. */ -VLC_EXPORT( picture_t *, picture_pool_Get, ( picture_pool_t * ) ); +VLC_EXPORT( picture_t *, picture_pool_Get, ( picture_pool_t * ) LIBVLC_USED ); /** * It forces the next picture_pool_Get to return a picture even if no @@ -114,7 +114,7 @@ VLC_EXPORT( void, picture_pool_NonEmpty, ( picture_pool_t *, bool reset ) ); * The returned pool must be deleted before the master pool. * When deleted, all pictures return to the master pool. */ -VLC_EXPORT( picture_pool_t *, picture_pool_Reserve, (picture_pool_t *, int picture_count) ); +VLC_EXPORT( picture_pool_t *, picture_pool_Reserve, (picture_pool_t *, int picture_count) LIBVLC_USED ); /** * It returns the size of the given pool. diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index e8576ff813..1af2358707 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -248,7 +248,7 @@ enum pl_locked_state #define PL_UNLOCK playlist_Unlock( p_playlist ) #define PL_ASSERT_LOCKED playlist_AssertLocked( p_playlist ) -VLC_EXPORT( playlist_t *, pl_Get, ( vlc_object_t * ) ); +VLC_EXPORT( playlist_t *, pl_Get, ( vlc_object_t * ) LIBVLC_USED ); #define pl_Get( a ) pl_Get( VLC_OBJECT(a) ) /* Playlist control */ @@ -277,7 +277,7 @@ VLC_EXPORT( int, playlist_Control, ( playlist_t *p_playlist, int i_query, bool b /** Get current playing input. The object is retained. */ -VLC_EXPORT( input_thread_t *, playlist_CurrentInput, ( playlist_t *p_playlist ) ); +VLC_EXPORT( input_thread_t *, playlist_CurrentInput, ( playlist_t *p_playlist ) LIBVLC_USED ); /** Clear the playlist * \param b_locked TRUE if playlist is locked when entering this function @@ -295,7 +295,7 @@ VLC_EXPORT( int, playlist_TreeMove, ( playlist_t *, playlist_item_t *, playlist VLC_EXPORT( int, playlist_TreeMoveMany, ( playlist_t *, int, playlist_item_t **, playlist_item_t *, int ) ); VLC_EXPORT( int, playlist_RecursiveNodeSort, ( playlist_t *, playlist_item_t *,int, int ) ); -VLC_EXPORT( playlist_item_t *, playlist_CurrentPlayingItem, ( playlist_t * ) ); +VLC_EXPORT( playlist_item_t *, playlist_CurrentPlayingItem, ( playlist_t * ) LIBVLC_USED ); VLC_EXPORT( int, playlist_Status, ( playlist_t * ) ); /** @@ -339,8 +339,8 @@ VLC_EXPORT( playlist_item_t *, playlist_NodeAddInput, ( playlist_t *, input_item VLC_EXPORT( int, playlist_NodeAddCopy, ( playlist_t *, playlist_item_t *, playlist_item_t *, int ) ); /********************************** Item search *************************/ -VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int ) ); -VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t * ) ); +VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int ) LIBVLC_USED ); +VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t * ) LIBVLC_USED ); VLC_EXPORT( int, playlist_LiveSearchUpdate, (playlist_t *, playlist_item_t *, const char *, bool ) ); @@ -352,11 +352,11 @@ VLC_EXPORT( playlist_item_t *, playlist_NodeCreate, ( playlist_t *, const char * VLC_EXPORT( int, playlist_NodeAppend, (playlist_t *,playlist_item_t*,playlist_item_t *) ); VLC_EXPORT( int, playlist_NodeInsert, (playlist_t *,playlist_item_t*,playlist_item_t *, int) ); VLC_EXPORT( int, playlist_NodeRemoveItem, (playlist_t *,playlist_item_t*,playlist_item_t *) ); -VLC_EXPORT( playlist_item_t *, playlist_ChildSearchName, (playlist_item_t*, const char* ) ); +VLC_EXPORT( playlist_item_t *, playlist_ChildSearchName, (playlist_item_t*, const char* ) LIBVLC_USED ); VLC_EXPORT( int, playlist_NodeDelete, ( playlist_t *, playlist_item_t *, bool , bool ) ); -VLC_EXPORT( playlist_item_t *, playlist_GetNextLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) ); -VLC_EXPORT( playlist_item_t *, playlist_GetPrevLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) ); +VLC_EXPORT( playlist_item_t *, playlist_GetNextLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) LIBVLC_USED ); +VLC_EXPORT( playlist_item_t *, playlist_GetPrevLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, bool b_ena, bool b_unplayed ) LIBVLC_USED ); /*********************************************************************** * Inline functions diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h index 956b77b65f..58ff2a77ce 100644 --- a/include/vlc_services_discovery.h +++ b/include/vlc_services_discovery.h @@ -68,12 +68,12 @@ enum services_discovery_category_e /* Get the services discovery modules names to use in Create(), in a null * terminated string array. Array and string must be freed after use. */ -VLC_EXPORT( char **, vlc_sd_GetNames, ( vlc_object_t *, char ***, int ** ) ); +VLC_EXPORT( char **, vlc_sd_GetNames, ( vlc_object_t *, char ***, int ** ) LIBVLC_USED ); #define vlc_sd_GetNames(obj, pln, pcat ) \ vlc_sd_GetNames(VLC_OBJECT(obj), pln, pcat) /* Creation of a service_discovery object */ -VLC_EXPORT( services_discovery_t *, vlc_sd_Create, ( vlc_object_t *, const char * ) ); +VLC_EXPORT( services_discovery_t *, vlc_sd_Create, ( vlc_object_t *, const char * ) LIBVLC_USED ); VLC_EXPORT( bool, vlc_sd_Start, ( services_discovery_t * ) ); VLC_EXPORT( void, vlc_sd_Stop, ( services_discovery_t * ) ); VLC_EXPORT( void, vlc_sd_Destroy, ( services_discovery_t * ) ); @@ -85,10 +85,10 @@ static inline void vlc_sd_StopAndDestroy( services_discovery_t * p_this ) } /* Read info from discovery object */ -VLC_EXPORT( char *, services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) ); +VLC_EXPORT( char *, services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) LIBVLC_USED ); /* Receive event notification (preferred way to get new items) */ -VLC_EXPORT( vlc_event_manager_t *, services_discovery_EventManager, ( services_discovery_t * p_this ) ); +VLC_EXPORT( vlc_event_manager_t *, services_discovery_EventManager, ( services_discovery_t * p_this ) LIBVLC_USED ); /* Used by services_discovery to post update about their items */ /* About the psz_category, it is a legacy way to add info to the item, diff --git a/include/vlc_sout.h b/include/vlc_sout.h index 03740c076b..3a336bb1a4 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -106,7 +106,7 @@ enum access_out_query_e ACCESS_OUT_CONTROLS_PACE, /* arg1=bool *, can fail (assume true) */ }; -VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( vlc_object_t *, const char *psz_access, const char *psz_name ) ); +VLC_EXPORT( sout_access_out_t *,sout_AccessOutNew, ( vlc_object_t *, const char *psz_access, const char *psz_name ) LIBVLC_USED ); #define sout_AccessOutNew( obj, access, name ) \ sout_AccessOutNew( VLC_OBJECT(obj), access, name ) VLC_EXPORT( void, sout_AccessOutDelete, ( sout_access_out_t * ) ); @@ -177,8 +177,8 @@ struct sout_input_t }; -VLC_EXPORT( sout_mux_t *, sout_MuxNew, ( sout_instance_t*, const char *, sout_access_out_t * ) ); -VLC_EXPORT( sout_input_t *, sout_MuxAddStream, ( sout_mux_t *, es_format_t * ) ); +VLC_EXPORT( sout_mux_t *, sout_MuxNew, ( sout_instance_t*, const char *, sout_access_out_t * ) LIBVLC_USED ); +VLC_EXPORT( sout_input_t *, sout_MuxAddStream, ( sout_mux_t *, es_format_t * ) LIBVLC_USED ); VLC_EXPORT( void, sout_MuxDeleteStream, ( sout_mux_t *, sout_input_t * ) ); VLC_EXPORT( void, sout_MuxDelete, ( sout_mux_t * ) ); VLC_EXPORT( void, sout_MuxSendBuffer, ( sout_mux_t *, sout_input_t *, block_t * ) ); @@ -224,7 +224,7 @@ struct sout_stream_t VLC_EXPORT( void, sout_StreamChainDelete, (sout_stream_t *p_first, sout_stream_t *p_last ) ); VLC_EXPORT( sout_stream_t *, sout_StreamChainNew, (sout_instance_t *p_sout, - char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) ); + char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) LIBVLC_USED ); static inline sout_stream_id_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt ) { @@ -249,19 +249,19 @@ VLC_EXPORT( encoder_t *, sout_EncoderCreate, ( vlc_object_t *obj ) ); /**************************************************************************** * Announce handler ****************************************************************************/ -VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( vlc_object_t *, const char *, const char *, announce_method_t* ) ); +VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, ( vlc_object_t *, const char *, const char *, announce_method_t* ) LIBVLC_USED ); VLC_EXPORT( int, sout_AnnounceUnRegister, (vlc_object_t *,session_descriptor_t* ) ); #define sout_AnnounceRegisterSDP(o, sdp, addr, m) \ sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr, m) #define sout_AnnounceUnRegister(o, a) \ sout_AnnounceUnRegister(VLC_OBJECT (o), a) -VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) ); +VLC_EXPORT(announce_method_t*, sout_SAPMethod, (void) LIBVLC_USED ); VLC_EXPORT(void, sout_MethodRelease, (announce_method_t *) ); /** SDP */ -VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) ); +VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) LIBVLC_USED ); VLC_EXPORT( char *, sdp_AddMedia, (char **sdp, const char *type, const char *protocol, int dport, unsigned pt, bool bw_indep, unsigned bw, const char *ptname, unsigned clockrate, unsigned channels, const char *fmtp) ); VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) LIBVLC_FORMAT( 3, 4 ) );