Commit 6a065215 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Rename VLC_{PUBLIC,DEPRECATED}_API to LIBVLC_{API,DEPRECATED}

There are no functional, source or binary changes. This is only for
consistency: libvlc stuff -> LIBVLC, vlc plugin stuff -> VLC
parent 92f1b3ae
This diff is collapsed.
......@@ -56,7 +56,7 @@ extern "C" {
* \param i_options the number of options to add to the item
* \param ppsz_options the options to add to the item
*/
VLC_DEPRECATED_API void libvlc_playlist_play( libvlc_instance_t *p_instance,
LIBVLC_DEPRECATED void libvlc_playlist_play( libvlc_instance_t *p_instance,
int i_id, int i_options,
char **ppsz_options );
......
This diff is collapsed.
......@@ -185,7 +185,7 @@ typedef struct libvlc_media_track_info_t
* \param psz_mrl the media location
* \return the newly created media or NULL on error
*/
VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_location(
LIBVLC_API libvlc_media_t *libvlc_media_new_location(
libvlc_instance_t *p_instance,
const char * psz_mrl );
......@@ -198,7 +198,7 @@ VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_location(
* \param path local filesystem path
* \return the newly created media or NULL on error
*/
VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_path(
LIBVLC_API libvlc_media_t *libvlc_media_new_path(
libvlc_instance_t *p_instance,
const char *path );
......@@ -226,7 +226,7 @@ VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_path(
* \param fd open file descriptor
* \return the newly created media or NULL on error
*/
VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_fd(
LIBVLC_API libvlc_media_t *libvlc_media_new_fd(
libvlc_instance_t *p_instance,
int fd );
......@@ -240,7 +240,7 @@ VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_fd(
* \param psz_name the name of the node
* \return the new empty media or NULL on error
*/
VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_as_node(
LIBVLC_API libvlc_media_t *libvlc_media_new_as_node(
libvlc_instance_t *p_instance,
const char * psz_name );
......@@ -256,7 +256,7 @@ VLC_PUBLIC_API libvlc_media_t *libvlc_media_new_as_node(
* \param p_md the media descriptor
* \param ppsz_options the options (as a string)
*/
VLC_PUBLIC_API void libvlc_media_add_option(
LIBVLC_API void libvlc_media_add_option(
libvlc_media_t *p_md,
const char * ppsz_options );
......@@ -273,7 +273,7 @@ VLC_PUBLIC_API void libvlc_media_add_option(
* \param ppsz_options the options (as a string)
* \param i_flags the flags for this option
*/
VLC_PUBLIC_API void libvlc_media_add_option_flag(
LIBVLC_API void libvlc_media_add_option_flag(
libvlc_media_t *p_md,
const char * ppsz_options,
unsigned i_flags );
......@@ -286,7 +286,7 @@ VLC_PUBLIC_API void libvlc_media_add_option_flag(
*
* \param p_md the media descriptor
*/
VLC_PUBLIC_API void libvlc_media_retain( libvlc_media_t *p_md );
LIBVLC_API void libvlc_media_retain( libvlc_media_t *p_md );
/**
* Decrement the reference count of a media descriptor object. If the
......@@ -297,7 +297,7 @@ VLC_PUBLIC_API void libvlc_media_retain( libvlc_media_t *p_md );
*
* \param p_md the media descriptor
*/
VLC_PUBLIC_API void libvlc_media_release( libvlc_media_t *p_md );
LIBVLC_API void libvlc_media_release( libvlc_media_t *p_md );
/**
......@@ -306,14 +306,14 @@ VLC_PUBLIC_API void libvlc_media_release( libvlc_media_t *p_md );
* \param p_md a media descriptor object
* \return string with mrl of media descriptor object
*/
VLC_PUBLIC_API char *libvlc_media_get_mrl( libvlc_media_t *p_md );
LIBVLC_API char *libvlc_media_get_mrl( libvlc_media_t *p_md );
/**
* Duplicate a media descriptor object.
*
* \param p_md a media descriptor object.
*/
VLC_PUBLIC_API libvlc_media_t *libvlc_media_duplicate( libvlc_media_t *p_md );
LIBVLC_API libvlc_media_t *libvlc_media_duplicate( libvlc_media_t *p_md );
/**
* Read the meta of the media.
......@@ -332,7 +332,7 @@ VLC_PUBLIC_API libvlc_media_t *libvlc_media_duplicate( libvlc_media_t *p_md );
* \param e_meta the meta to read
* \return the media's meta
*/
VLC_PUBLIC_API char *libvlc_media_get_meta( libvlc_media_t *p_md,
LIBVLC_API char *libvlc_media_get_meta( libvlc_media_t *p_md,
libvlc_meta_t e_meta );
/**
......@@ -343,7 +343,7 @@ VLC_PUBLIC_API char *libvlc_media_get_meta( libvlc_media_t *p_md,
* \param e_meta the meta to write
* \param psz_value the media's meta
*/
VLC_PUBLIC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
LIBVLC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
libvlc_meta_t e_meta,
const char *psz_value );
......@@ -354,7 +354,7 @@ VLC_PUBLIC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
* \param p_md the media desriptor
* \return true if the write operation was successfull
*/
VLC_PUBLIC_API int libvlc_media_save_meta( libvlc_media_t *p_md );
LIBVLC_API int libvlc_media_save_meta( libvlc_media_t *p_md );
/**
......@@ -368,7 +368,7 @@ VLC_PUBLIC_API int libvlc_media_save_meta( libvlc_media_t *p_md );
* \param p_md a media descriptor object
* \return state of media descriptor object
*/
VLC_PUBLIC_API libvlc_state_t libvlc_media_get_state(
LIBVLC_API libvlc_state_t libvlc_media_get_state(
libvlc_media_t *p_md );
......@@ -379,7 +379,7 @@ VLC_PUBLIC_API libvlc_state_t libvlc_media_get_state(
* (this structure must be allocated by the caller)
* \return true if the statistics are available, false otherwise
*/
VLC_PUBLIC_API int libvlc_media_get_stats( libvlc_media_t *p_md,
LIBVLC_API int libvlc_media_get_stats( libvlc_media_t *p_md,
libvlc_media_stats_t *p_stats );
/**
......@@ -395,7 +395,7 @@ VLC_PUBLIC_API int libvlc_media_get_stats( libvlc_media_t *p_md,
* and this is here for convenience */
#define VLC_FORWARD_DECLARE_OBJECT(a) struct a
VLC_PUBLIC_API VLC_FORWARD_DECLARE_OBJECT(libvlc_media_list_t *)
LIBVLC_API VLC_FORWARD_DECLARE_OBJECT(libvlc_media_list_t *)
libvlc_media_subitems( libvlc_media_t *p_md );
/**
......@@ -405,7 +405,7 @@ libvlc_media_subitems( libvlc_media_t *p_md );
* \param p_md a media descriptor object
* \return event manager object
*/
VLC_PUBLIC_API libvlc_event_manager_t *
LIBVLC_API libvlc_event_manager_t *
libvlc_media_event_manager( libvlc_media_t *p_md );
/**
......@@ -414,7 +414,7 @@ VLC_PUBLIC_API libvlc_event_manager_t *
* \param p_md media descriptor object
* \return duration of media item or -1 on error
*/
VLC_PUBLIC_API libvlc_time_t
LIBVLC_API libvlc_time_t
libvlc_media_get_duration( libvlc_media_t *p_md );
/**
......@@ -429,7 +429,7 @@ VLC_PUBLIC_API libvlc_time_t
*
* \param p_md media descriptor object
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_parse( libvlc_media_t *p_md );
/**
......@@ -449,7 +449,7 @@ libvlc_media_parse( libvlc_media_t *p_md );
*
* \param p_md media descriptor object
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_parse_async( libvlc_media_t *p_md );
/**
......@@ -460,7 +460,7 @@ libvlc_media_parse_async( libvlc_media_t *p_md );
* \param p_md media descriptor object
* \return true if media object has been parsed otherwise it returns false
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_is_parsed( libvlc_media_t *p_md );
/**
......@@ -471,7 +471,7 @@ VLC_PUBLIC_API int
* \param p_md media descriptor object
* \param p_new_user_data pointer to user data
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_set_user_data( libvlc_media_t *p_md, void *p_new_user_data );
/**
......@@ -481,7 +481,7 @@ VLC_PUBLIC_API void
*
* \param p_md media descriptor object
*/
VLC_PUBLIC_API void *libvlc_media_get_user_data( libvlc_media_t *p_md );
LIBVLC_API void *libvlc_media_get_user_data( libvlc_media_t *p_md );
/**
* Get media descriptor's elementary streams description
......@@ -496,7 +496,7 @@ VLC_PUBLIC_API void *libvlc_media_get_user_data( libvlc_media_t *p_md );
*
* \return the number of Elementary Streams
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_media_get_tracks_info( libvlc_media_t *p_md,
libvlc_media_track_info_t **tracks );
......
......@@ -54,7 +54,7 @@ typedef struct libvlc_media_discoverer_t libvlc_media_discoverer_t;
* \param psz_name service name
* \return media discover object or NULL in case of error
*/
VLC_PUBLIC_API libvlc_media_discoverer_t *
LIBVLC_API libvlc_media_discoverer_t *
libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
const char * psz_name );
......@@ -64,7 +64,7 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
*
* \param p_mdis media service discover object
*/
VLC_PUBLIC_API void libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis );
LIBVLC_API void libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis );
/**
* Get media service discover object its localized name.
......@@ -72,7 +72,7 @@ VLC_PUBLIC_API void libvlc_media_discoverer_release( libvlc_media_discoverer_t
* \param p_mdis media discover object
* \return localized name
*/
VLC_PUBLIC_API char * libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis );
LIBVLC_API char * libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis );
/**
* Get media service discover media list.
......@@ -80,7 +80,7 @@ VLC_PUBLIC_API char * libvlc_media_discoverer_localized_name( libvlc_media_disco
* \param p_mdis media service discover object
* \return list of media items
*/
VLC_PUBLIC_API libvlc_media_list_t * libvlc_media_discoverer_media_list( libvlc_media_discoverer_t * p_mdis );
LIBVLC_API libvlc_media_list_t * libvlc_media_discoverer_media_list( libvlc_media_discoverer_t * p_mdis );
/**
* Get event manager from media service discover object.
......@@ -88,7 +88,7 @@ VLC_PUBLIC_API libvlc_media_list_t * libvlc_media_discoverer_media_list( libvlc_
* \param p_mdis media service discover object
* \return event manager object.
*/
VLC_PUBLIC_API libvlc_event_manager_t *
LIBVLC_API libvlc_event_manager_t *
libvlc_media_discoverer_event_manager( libvlc_media_discoverer_t * p_mdis );
/**
......@@ -97,7 +97,7 @@ VLC_PUBLIC_API libvlc_event_manager_t *
* \param p_mdis media service discover object
* \return true if running, false if not
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis );
/**@} */
......
......@@ -48,7 +48,7 @@ typedef struct libvlc_media_library_t libvlc_media_library_t;
* \param p_instance the libvlc instance
* \return a new object or NULL on error
*/
VLC_PUBLIC_API libvlc_media_library_t *
LIBVLC_API libvlc_media_library_t *
libvlc_media_library_new( libvlc_instance_t * p_instance );
/**
......@@ -58,7 +58,7 @@ VLC_PUBLIC_API libvlc_media_library_t *
*
* \param p_mlib media library object
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_library_release( libvlc_media_library_t * p_mlib );
/**
......@@ -68,7 +68,7 @@ VLC_PUBLIC_API void
*
* \param p_mlib media library object
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_library_retain( libvlc_media_library_t * p_mlib );
/**
......@@ -77,7 +77,7 @@ VLC_PUBLIC_API void
* \param p_mlib media library object
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_library_load( libvlc_media_library_t * p_mlib );
/**
......@@ -86,7 +86,7 @@ VLC_PUBLIC_API int
* \param p_mlib media library object
* \return media list subitems
*/
VLC_PUBLIC_API libvlc_media_list_t *
LIBVLC_API libvlc_media_list_t *
libvlc_media_library_media_list( libvlc_media_library_t * p_mlib );
......
......@@ -47,7 +47,7 @@ typedef struct libvlc_media_list_t libvlc_media_list_t;
* \param p_instance libvlc instance
* \return empty media list, or NULL on error
*/
VLC_PUBLIC_API libvlc_media_list_t *
LIBVLC_API libvlc_media_list_t *
libvlc_media_list_new( libvlc_instance_t *p_instance );
/**
......@@ -55,7 +55,7 @@ VLC_PUBLIC_API libvlc_media_list_t *
*
* \param p_ml a media list created with libvlc_media_list_new()
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_release( libvlc_media_list_t *p_ml );
/**
......@@ -63,10 +63,10 @@ VLC_PUBLIC_API void
*
* \param p_ml a media list created with libvlc_media_list_new()
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_retain( libvlc_media_list_t *p_ml );
VLC_DEPRECATED_API int
LIBVLC_DEPRECATED int
libvlc_media_list_add_file_content( libvlc_media_list_t * p_ml,
const char * psz_uri );
......@@ -78,7 +78,7 @@ VLC_DEPRECATED_API int
* \param p_ml a media list instance
* \param p_md media instance to add
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_set_media( libvlc_media_list_t *p_ml, libvlc_media_t *p_md );
/**
......@@ -89,7 +89,7 @@ libvlc_media_list_set_media( libvlc_media_list_t *p_ml, libvlc_media_t *p_md );
* \param p_ml a media list instance
* \return media instance
*/
VLC_PUBLIC_API libvlc_media_t *
LIBVLC_API libvlc_media_t *
libvlc_media_list_media( libvlc_media_list_t *p_ml );
/**
......@@ -100,7 +100,7 @@ VLC_PUBLIC_API libvlc_media_t *
* \param p_md a media instance
* \return 0 on success, -1 if the media list is read-only
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_add_media( libvlc_media_list_t *p_ml, libvlc_media_t *p_md );
/**
......@@ -112,7 +112,7 @@ libvlc_media_list_add_media( libvlc_media_list_t *p_ml, libvlc_media_t *p_md );
* \param i_pos position in array where to insert
* \return 0 on success, -1 if the media list si read-only
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_insert_media( libvlc_media_list_t *p_ml,
libvlc_media_t *p_md, int i_pos );
......@@ -124,7 +124,7 @@ libvlc_media_list_insert_media( libvlc_media_list_t *p_ml,
* \param i_pos position in array where to insert
* \return 0 on success, -1 if the list is read-only or the item was not found
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_remove_index( libvlc_media_list_t *p_ml, int i_pos );
/**
......@@ -134,7 +134,7 @@ libvlc_media_list_remove_index( libvlc_media_list_t *p_ml, int i_pos );
* \param p_ml a media list instance
* \return number of items in media list
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_count( libvlc_media_list_t *p_ml );
/**
......@@ -147,7 +147,7 @@ VLC_PUBLIC_API int
* In case of success, libvlc_media_retain() is called to increase the refcount
* on the media.
*/
VLC_PUBLIC_API libvlc_media_t *
LIBVLC_API libvlc_media_t *
libvlc_media_list_item_at_index( libvlc_media_list_t *p_ml, int i_pos );
/**
* Find index position of List media instance in media list.
......@@ -158,7 +158,7 @@ VLC_PUBLIC_API libvlc_media_t *
* \param p_md media list instance
* \return position of media instance
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_index_of_item( libvlc_media_list_t *p_ml,
libvlc_media_t *p_md );
......@@ -168,7 +168,7 @@ VLC_PUBLIC_API int
* \param p_ml media list instance
* \return 0 on readonly, 1 on readwrite
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_is_readonly( libvlc_media_list_t * p_ml );
/**
......@@ -176,7 +176,7 @@ VLC_PUBLIC_API int
*
* \param p_ml a media list instance
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_lock( libvlc_media_list_t *p_ml );
/**
......@@ -185,7 +185,7 @@ VLC_PUBLIC_API void
*
* \param p_ml a media list instance
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_unlock( libvlc_media_list_t *p_ml );
/**
......@@ -195,7 +195,7 @@ VLC_PUBLIC_API void
* \param p_ml a media list instance
* \return libvlc_event_manager
*/
VLC_PUBLIC_API libvlc_event_manager_t *
LIBVLC_API libvlc_event_manager_t *
libvlc_media_list_event_manager( libvlc_media_list_t *p_ml );
/** @} media_list */
......
......@@ -64,7 +64,7 @@ typedef enum libvlc_playback_mode_t
* \param p_instance libvlc instance
* \return media list player instance or NULL on error
*/
VLC_PUBLIC_API libvlc_media_list_player_t *
LIBVLC_API libvlc_media_list_player_t *
libvlc_media_list_player_new( libvlc_instance_t * p_instance );
/**
......@@ -72,7 +72,7 @@ VLC_PUBLIC_API libvlc_media_list_player_t *
*
* \param p_mlp media list player instance
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp );
/**
......@@ -81,7 +81,7 @@ VLC_PUBLIC_API void
* \param p_mlp media list player instance
* \return the event manager
*/
VLC_PUBLIC_API libvlc_event_manager_t *
LIBVLC_API libvlc_event_manager_t *
libvlc_media_list_player_event_manager(libvlc_media_list_player_t * p_mlp);
/**
......@@ -90,7 +90,7 @@ VLC_PUBLIC_API libvlc_event_manager_t *
* \param p_mlp media list player instance
* \param p_mi media player instance
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_player_set_media_player(
libvlc_media_list_player_t * p_mlp,
libvlc_media_player_t * p_mi );
......@@ -101,7 +101,7 @@ VLC_PUBLIC_API void
* \param p_mlp media list player instance
* \param p_mlist list of media
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_player_set_media_list(
libvlc_media_list_player_t * p_mlp,
libvlc_media_list_t * p_mlist );
......@@ -111,7 +111,7 @@ VLC_PUBLIC_API void
*
* \param p_mlp media list player instance
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp);
/**
......@@ -119,7 +119,7 @@ void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp);
*
* \param p_mlp media list player instance
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp);
/**
......@@ -128,7 +128,7 @@ void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp);
* \param p_mlp media list player instance
* \return true for playing and false for not playing
*/
VLC_PUBLIC_API int
LIBVLC_API int
libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp );
/**
......@@ -137,7 +137,7 @@ VLC_PUBLIC_API int
* \param p_mlp media list player instance
* \return libvlc_state_t for media list player
*/
VLC_PUBLIC_API libvlc_state_t
LIBVLC_API libvlc_state_t
libvlc_media_list_player_get_state( libvlc_media_list_player_t * p_mlp );
/**
......@@ -147,7 +147,7 @@ VLC_PUBLIC_API libvlc_state_t
* \param i_index index in media list to play
* \return 0 upon success -1 if the item wasn't found
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp,
int i_index);
......@@ -158,7 +158,7 @@ int libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_m
* \param p_md the media instance
* \return 0 upon success, -1 if the media is not part of the media list
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp,
libvlc_media_t * p_md);
......@@ -167,7 +167,7 @@ int libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp,
*
* \param p_mlp media list player instance
*/
VLC_PUBLIC_API void
LIBVLC_API void
libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp);
/**
......@@ -176,7 +176,7 @@ VLC_PUBLIC_API void
* \param p_mlp media list player instance
* \return 0 upon success -1 if there is no next item
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp);
/**
......@@ -185,7 +185,7 @@ int libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp);
* \param p_mlp media list player instance
* \return 0 upon success -1 if there is no previous item
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp);
......@@ -196,7 +196,7 @@ int libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp);
* \param p_mlp media list player instance
* \param e_mode playback mode specification
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_media_list_player_set_playback_mode(libvlc_media_list_player_t * p_mlp,
libvlc_playback_mode_t e_mode );
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment