Skip to content

V
vlc-2-2
Commit 6a065215 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 268 deletions
bindings/mediacontrol/mediacontrol.h
View file @ 6a065215
......@@ -65,43 +65,43 @@ typedef struct mediacontrol_Instance mediacontrol_Instance;
* Free a RGBPicture structure.
* \param pic: the RGBPicture structure
*/
VLC_PUBLIC_API void mediacontrol_RGBPicture__free( mediacontrol_RGBPicture *pic );
LIBVLC_API void mediacontrol_RGBPicture__free( mediacontrol_RGBPicture *pic );
VLC_PUBLIC_API void mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq *ps );
LIBVLC_API void mediacontrol_PlaylistSeq__free( mediacontrol_PlaylistSeq *ps );
/**
* Free a StreamInformation structure.
* \param pic: the StreamInformation structure
*/
VLC_PUBLIC_API void
LIBVLC_API void
mediacontrol_StreamInformation__free( mediacontrol_StreamInformation* p_si );
/**
* Instanciate and initialize an exception structure.
* \return the exception
*/
VLC_PUBLIC_API mediacontrol_Exception *
LIBVLC_API mediacontrol_Exception *
mediacontrol_exception_create( void );
/**
* Initialize an existing exception structure.
* \param p_exception the exception to initialize.
*/
VLC_PUBLIC_API void
LIBVLC_API void
mediacontrol_exception_init( mediacontrol_Exception *exception );
/**
* Clean up an existing exception structure after use.
* \param p_exception the exception to clean up.
*/
VLC_PUBLIC_API void
LIBVLC_API void
mediacontrol_exception_cleanup( mediacontrol_Exception *exception );
/**
* Free an exception structure created with mediacontrol_exception_create().
* \param p_exception the exception to free.
*/
VLC_PUBLIC_API void mediacontrol_exception_free(mediacontrol_Exception *exception);
LIBVLC_API void mediacontrol_exception_free(mediacontrol_Exception *exception);
/*****************************************************************************
* Core functions
......@@ -114,7 +114,7 @@ VLC_PUBLIC_API void mediacontrol_exception_free(mediacontrol_Exception *exceptio
* \param exception an initialized exception pointer
* \return a mediacontrol_Instance
*/
VLC_PUBLIC_API mediacontrol_Instance *
LIBVLC_API mediacontrol_Instance *
mediacontrol_new( int argc, char **argv, mediacontrol_Exception *exception );
/**
......@@ -123,7 +123,7 @@ mediacontrol_new( int argc, char **argv, mediacontrol_Exception *exception );
* \param exception an initialized exception pointer
* \return a mediacontrol_Instance
*/
VLC_PUBLIC_API mediacontrol_Instance *
LIBVLC_API mediacontrol_Instance *
mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
mediacontrol_Exception *exception );
......@@ -132,7 +132,7 @@ mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
* \param self: the mediacontrol instance
* \return a libvlc instance
*/
VLC_PUBLIC_API libvlc_instance_t*
LIBVLC_API libvlc_instance_t*
mediacontrol_get_libvlc_instance( mediacontrol_Instance* self );
/**
......@@ -140,7 +140,7 @@ mediacontrol_get_libvlc_instance( mediacontrol_Instance* self );
* \param self: the mediacontrol instance
* \return a libvlc_media_player_t instance
*/
VLC_PUBLIC_API libvlc_media_player_t*
LIBVLC_API libvlc_media_player_t*
mediacontrol_get_media_player( mediacontrol_Instance* self );
/**
......@@ -151,7 +151,7 @@ mediacontrol_get_media_player( mediacontrol_Instance* self );
* \param exception an initialized exception pointer
* \return a mediacontrol_Position
*/
VLC_PUBLIC_API mediacontrol_Position * mediacontrol_get_media_position(
LIBVLC_API mediacontrol_Position * mediacontrol_get_media_position(
mediacontrol_Instance *self,
const mediacontrol_PositionOrigin an_origin,
const mediacontrol_PositionKey a_key,
......@@ -163,7 +163,7 @@ VLC_PUBLIC_API mediacontrol_Position * mediacontrol_get_media_position(
* \param a_position a mediacontrol_Position
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_set_media_position( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_set_media_position( mediacontrol_Instance *self,
const mediacontrol_Position *a_position,
mediacontrol_Exception *exception );
......@@ -173,7 +173,7 @@ VLC_PUBLIC_API void mediacontrol_set_media_position( mediacontrol_Instance *self
* \param a_position a mediacontrol_Position
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_start( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_start( mediacontrol_Instance *self,
const mediacontrol_Position *a_position,
mediacontrol_Exception *exception );
......@@ -182,7 +182,7 @@ VLC_PUBLIC_API void mediacontrol_start( mediacontrol_Instance *self,
* \param self the mediacontrol instance
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_pause( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_pause( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
......@@ -190,7 +190,7 @@ VLC_PUBLIC_API void mediacontrol_pause( mediacontrol_Instance *self,
* \param self the mediacontrol instance
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_resume( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_resume( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
......@@ -198,14 +198,14 @@ VLC_PUBLIC_API void mediacontrol_resume( mediacontrol_Instance *self,
* \param self the mediacontrol instance
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_stop( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_stop( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
* Exit the player
* \param self the mediacontrol instance
*/
VLC_PUBLIC_API void mediacontrol_exit( mediacontrol_Instance *self );
LIBVLC_API void mediacontrol_exit( mediacontrol_Instance *self );
/**
* Set the MRL to be played.
......@@ -213,7 +213,7 @@ VLC_PUBLIC_API void mediacontrol_exit( mediacontrol_Instance *self );
* \param psz_file the MRL
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_set_mrl( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_set_mrl( mediacontrol_Instance *self,
const char* psz_file,
mediacontrol_Exception *exception );
......@@ -222,7 +222,7 @@ VLC_PUBLIC_API void mediacontrol_set_mrl( mediacontrol_Instance *self,
* \param self the mediacontrol instance
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API char * mediacontrol_get_mrl( mediacontrol_Instance *self,
LIBVLC_API char * mediacontrol_get_mrl( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/*****************************************************************************
......@@ -235,7 +235,7 @@ VLC_PUBLIC_API char * mediacontrol_get_mrl( mediacontrol_Instance *self,
* \param exception an initialized exception pointer
* \return a RGBpicture
*/
VLC_PUBLIC_API mediacontrol_RGBPicture *
LIBVLC_API mediacontrol_RGBPicture *
mediacontrol_snapshot( mediacontrol_Instance *self,
const mediacontrol_Position *a_position,
mediacontrol_Exception *exception );
......@@ -248,7 +248,7 @@ VLC_PUBLIC_API mediacontrol_RGBPicture *
* \param end the end position
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_display_text( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_display_text( mediacontrol_Instance *self,
const char *message,
const mediacontrol_Position *begin,
const mediacontrol_Position *end,
......@@ -261,7 +261,7 @@ VLC_PUBLIC_API void mediacontrol_display_text( mediacontrol_Instance *self,
* \param exception an initialized exception pointer
* \return a mediacontrol_StreamInformation
*/
VLC_PUBLIC_API mediacontrol_StreamInformation *
LIBVLC_API mediacontrol_StreamInformation *
mediacontrol_get_stream_information( mediacontrol_Instance *self,
mediacontrol_PositionKey a_key,
mediacontrol_Exception *exception );
......@@ -272,7 +272,7 @@ VLC_PUBLIC_API mediacontrol_StreamInformation *
* \param exception an initialized exception pointer
* \return the volume
*/
VLC_PUBLIC_API unsigned short
LIBVLC_API unsigned short
mediacontrol_sound_get_volume( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
......@@ -281,7 +281,7 @@ VLC_PUBLIC_API unsigned short
* \param volume the volume (normalized in [0..100])
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_sound_set_volume( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_sound_set_volume( mediacontrol_Instance *self,
const unsigned short volume,
mediacontrol_Exception *exception );
......@@ -291,7 +291,7 @@ VLC_PUBLIC_API void mediacontrol_sound_set_volume( mediacontrol_Instance *self,
* \param visual_id the Xid or HWND, depending on the platform
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API int mediacontrol_set_visual( mediacontrol_Instance *self,
LIBVLC_API int mediacontrol_set_visual( mediacontrol_Instance *self,
WINDOWHANDLE visual_id,
mediacontrol_Exception *exception );
......@@ -301,7 +301,7 @@ VLC_PUBLIC_API int mediacontrol_set_visual( mediacontrol_Instance *self,
* \param exception an initialized exception pointer
* \return the rate
*/
VLC_PUBLIC_API int mediacontrol_get_rate( mediacontrol_Instance *self,
LIBVLC_API int mediacontrol_get_rate( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
......@@ -310,7 +310,7 @@ VLC_PUBLIC_API int mediacontrol_get_rate( mediacontrol_Instance *self,
* \param rate the desired rate
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_set_rate( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_set_rate( mediacontrol_Instance *self,
const int rate,
mediacontrol_Exception *exception );
......@@ -320,7 +320,7 @@ VLC_PUBLIC_API void mediacontrol_set_rate( mediacontrol_Instance *self,
* \param exception an initialized exception pointer
* \return the fullscreen status
*/
VLC_PUBLIC_API int mediacontrol_get_fullscreen( mediacontrol_Instance *self,
LIBVLC_API int mediacontrol_get_fullscreen( mediacontrol_Instance *self,
mediacontrol_Exception *exception );
/**
......@@ -329,7 +329,7 @@ VLC_PUBLIC_API int mediacontrol_get_fullscreen( mediacontrol_Instance *self,
* \param b_fullscreen the desired status
* \param exception an initialized exception pointer
*/
VLC_PUBLIC_API void mediacontrol_set_fullscreen( mediacontrol_Instance *self,
LIBVLC_API void mediacontrol_set_fullscreen( mediacontrol_Instance *self,
const int b_fullscreen,
mediacontrol_Exception *exception );
......
include/vlc/deprecated.h
View file @ 6a065215
......@@ -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 );
......
include/vlc/libvlc.h
View file @ 6a065215
......@@ -39,21 +39,21 @@
#define VLC_LIBVLC_H 1
#if defined (WIN32) && defined (DLL_EXPORT)
# define VLC_PUBLIC_API __declspec(dllexport)
# define LIBVLC_API __declspec(dllexport)
#elif defined (__GNUC__) && (__GNUC__ >= 4)
# define VLC_PUBLIC_API __attribute__((visibility("default")))
# define LIBVLC_API __attribute__((visibility("default")))
#else
# define VLC_PUBLIC_API
# define LIBVLC_API
#endif
#ifdef __LIBVLC__
/* Avoid unuseful warnings from libvlc with our deprecated APIs */
# define VLC_DEPRECATED_API VLC_PUBLIC_API
# define LIBVLC_DEPRECATED LIBVLC_API
#elif defined(__GNUC__) && \
(__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
# define VLC_DEPRECATED_API VLC_PUBLIC_API __attribute__((deprecated))
# define LIBVLC_DEPRECATED LIBVLC_API __attribute__((deprecated))
#else
# define VLC_DEPRECATED_API VLC_PUBLIC_API
# define LIBVLC_DEPRECATED LIBVLC_API
#endif
# ifdef __cplusplus
......@@ -87,14 +87,14 @@ extern "C" {
* @warning
* This will be NULL if there was no error.
*/
VLC_PUBLIC_API const char *libvlc_errmsg (void);
LIBVLC_API const char *libvlc_errmsg (void);
/**
* Clears the LibVLC error status for the current thread. This is optional.
* By default, the error status is automatically overridden when a new error
* occurs, and destroyed when the thread exits.
*/
VLC_PUBLIC_API void libvlc_clearerr (void);
LIBVLC_API void libvlc_clearerr (void);
/**
* Sets the LibVLC error status and message for the current thread.
......@@ -134,7 +134,7 @@ const char *libvlc_printerr (const char *fmt, ...);
* \param argv list of arguments (should be NULL)
* \return the libvlc instance or NULL in case of error
*/
VLC_PUBLIC_API libvlc_instance_t *
LIBVLC_API libvlc_instance_t *
libvlc_new( int argc , const char *const *argv );
/**
......@@ -143,7 +143,7 @@ libvlc_new( int argc , const char *const *argv );
*
* \param p_instance the instance to destroy
*/
VLC_PUBLIC_API void libvlc_release( libvlc_instance_t *p_instance );
LIBVLC_API void libvlc_release( libvlc_instance_t *p_instance );
/**
* Increments the reference count of a libvlc instance.
......@@ -151,7 +151,7 @@ VLC_PUBLIC_API void libvlc_release( libvlc_instance_t *p_instance );
*
* \param p_instance the instance to reference
*/
VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t *p_instance );
LIBVLC_API void libvlc_retain( libvlc_instance_t *p_instance );
/**
* Try to start a user interface for the libvlc instance.
......@@ -160,7 +160,7 @@ VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t *p_instance );
* \param name interface name, or NULL for default
* \return 0 on success, -1 on error.
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name );
/**
......@@ -175,7 +175,7 @@ int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name );
* \warning This function and libvlc_wait() cannot be used at the same time.
* Use either or none of them but not both.
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_set_exit_handler( libvlc_instance_t *p_instance,
void (*cb) (void *), void *opaque );
......@@ -185,7 +185,7 @@ void libvlc_set_exit_handler( libvlc_instance_t *p_instance,
*
* \param p_instance the instance
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_wait( libvlc_instance_t *p_instance );
/**
......@@ -197,7 +197,7 @@ void libvlc_wait( libvlc_instance_t *p_instance );
* \param http HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0"
* \version LibVLC 1.1.1 or later
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_set_user_agent( libvlc_instance_t *p_instance,
const char *name, const char *http );
......@@ -208,7 +208,7 @@ void libvlc_set_user_agent( libvlc_instance_t *p_instance,
*
* \return a string containing the libvlc version
*/
VLC_PUBLIC_API const char * libvlc_get_version(void);
LIBVLC_API const char * libvlc_get_version(void);
/**
* Retrieve libvlc compiler version.
......@@ -217,7 +217,7 @@ VLC_PUBLIC_API const char * libvlc_get_version(void);
*
* \return a string containing the libvlc compiler version
*/
VLC_PUBLIC_API const char * libvlc_get_compiler(void);
LIBVLC_API const char * libvlc_get_compiler(void);
/**
* Retrieve libvlc changeset.
......@@ -226,7 +226,7 @@ VLC_PUBLIC_API const char * libvlc_get_compiler(void);
*
* \return a string containing the libvlc changeset
*/
VLC_PUBLIC_API const char * libvlc_get_changeset(void);
LIBVLC_API const char * libvlc_get_changeset(void);
/**
* Frees an heap allocation returned by a LibVLC function.
......@@ -235,7 +235,7 @@ VLC_PUBLIC_API const char * libvlc_get_changeset(void);
*
* \param ptr the pointer
*/
VLC_PUBLIC_API void libvlc_free( void *ptr );
LIBVLC_API void libvlc_free( void *ptr );
/** \defgroup libvlc_event LibVLC asynchronous events
* LibVLC emits asynchronous events.
......@@ -278,7 +278,7 @@ typedef void ( *libvlc_callback_t )( const struct libvlc_event_t *, void * );
* \param user_data user provided data to carry with the event
* \return 0 on success, ENOMEM on error
*/
VLC_PUBLIC_API int libvlc_event_attach( libvlc_event_manager_t *p_event_manager,
LIBVLC_API int libvlc_event_attach( libvlc_event_manager_t *p_event_manager,
libvlc_event_type_t i_event_type,
libvlc_callback_t f_callback,
void *user_data );
......@@ -291,7 +291,7 @@ VLC_PUBLIC_API int libvlc_event_attach( libvlc_event_manager_t *p_event_manager,
* \param f_callback the function to call when i_event_type occurs
* \param p_user_data user provided data to carry with the event
*/
VLC_PUBLIC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
LIBVLC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
libvlc_event_type_t i_event_type,
libvlc_callback_t f_callback,
void *p_user_data );
......@@ -301,7 +301,7 @@ VLC_PUBLIC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager
*
* \param event_type the desired event
*/
VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_type );
LIBVLC_API const char * libvlc_event_type_name( libvlc_event_type_t event_type );
/** @} */
......@@ -317,7 +317,7 @@ VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_ty
* \param p_instance libvlc instance
* \return verbosity level for messages
*/
VLC_PUBLIC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
LIBVLC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_instance );
/**
* Set the VLC messaging verbosity level.
......@@ -325,7 +325,7 @@ VLC_PUBLIC_API unsigned libvlc_get_log_verbosity( const libvlc_instance_t *p_ins
* \param p_instance libvlc log instance
* \param level log level
*/
VLC_PUBLIC_API void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
LIBVLC_API void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, unsigned level );
/**
* Open a VLC message log instance.
......@@ -333,14 +333,14 @@ VLC_PUBLIC_API void libvlc_set_log_verbosity( libvlc_instance_t *p_instance, uns
* \param p_instance libvlc instance
* \return log message instance or NULL on error
*/
VLC_PUBLIC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance );
LIBVLC_API libvlc_log_t *libvlc_log_open( libvlc_instance_t *p_instance );
/**
* Close a VLC message log instance.
*
* \param p_log libvlc log instance or NULL
*/
VLC_PUBLIC_API void libvlc_log_close( libvlc_log_t *p_log );
LIBVLC_API void libvlc_log_close( libvlc_log_t *p_log );
/**
* Returns the number of messages in a log instance.
......@@ -348,7 +348,7 @@ VLC_PUBLIC_API void libvlc_log_close( libvlc_log_t *p_log );
* \param p_log libvlc log instance or NULL
* \return number of log messages, 0 if p_log is NULL
*/
VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *p_log );
LIBVLC_API unsigned libvlc_log_count( const libvlc_log_t *p_log );
/**
* Clear a log instance.
......@@ -358,7 +358,7 @@ VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *p_log );
*
* \param p_log libvlc log instance or NULL
*/
VLC_PUBLIC_API void libvlc_log_clear( libvlc_log_t *p_log );
LIBVLC_API void libvlc_log_clear( libvlc_log_t *p_log );
/**
* Allocate and returns a new iterator to messages in log.
......@@ -366,14 +366,14 @@ VLC_PUBLIC_API void libvlc_log_clear( libvlc_log_t *p_log );
* \param p_log libvlc log instance
* \return log iterator object or NULL on error
*/
VLC_PUBLIC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log );
LIBVLC_API libvlc_log_iterator_t *libvlc_log_get_iterator( const libvlc_log_t *p_log );
/**
* Release a previoulsy allocated iterator.
*
* \param p_iter libvlc log iterator or NULL
*/
VLC_PUBLIC_API void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
LIBVLC_API void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
/**
* Return whether log iterator has more messages.
......@@ -381,7 +381,7 @@ VLC_PUBLIC_API void libvlc_log_iterator_free( libvlc_log_iterator_t *p_iter );
* \param p_iter libvlc log iterator or NULL
* \return true if iterator has more message objects, else false
*/
VLC_PUBLIC_API int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter );
LIBVLC_API int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_iter );
/**
* Return the next log message.
......@@ -392,7 +392,7 @@ VLC_PUBLIC_API int libvlc_log_iterator_has_next( const libvlc_log_iterator_t *p_
* \param p_buffer log buffer
* \return log message object or NULL if none left
*/
VLC_PUBLIC_API libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
LIBVLC_API libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
libvlc_log_message_t *p_buffer );
/** @} */
......@@ -416,7 +416,7 @@ libvlc_module_description_t *libvlc_module_description_list_get( libvlc_instance
*
* \param p_list the list to be released
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_module_description_list_release( libvlc_module_description_t *p_list );
/**
......@@ -430,7 +430,7 @@ void libvlc_module_description_list_release( libvlc_module_description_t *p_list
* \see libvlc_module_description_t
* \see libvlc_module_description_list_release
*/
VLC_PUBLIC_API
LIBVLC_API
libvlc_module_description_t *libvlc_audio_filter_list_get( libvlc_instance_t *p_instance );
/**
......@@ -444,7 +444,7 @@ libvlc_module_description_t *libvlc_audio_filter_list_get( libvlc_instance_t *p_
* \see libvlc_module_description_t
* \see libvlc_module_description_list_release
*/
VLC_PUBLIC_API
LIBVLC_API
libvlc_module_description_t *libvlc_video_filter_list_get( libvlc_instance_t *p_instance );
/** @} */
......
include/vlc/libvlc_media.h
View file @ 6a065215
......@@ -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 );
......
include/vlc/libvlc_media_discoverer.h
View file @ 6a065215
......@@ -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 );
/**@} */
......
include/vlc/libvlc_media_library.h
View file @ 6a065215
......@@ -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 );
......
include/vlc/libvlc_media_list.h
View file @ 6a065215
......@@ -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 */
......
include/vlc/libvlc_media_list_player.h
View file @ 6a065215
......@@ -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 );
......
include/vlc/libvlc_media_player.h
View file @ 6a065215
......@@ -114,7 +114,7 @@ typedef enum libvlc_navigate_mode_t
* should be created.
* \return a new media player object, or NULL on error.
*/
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *p_libvlc_instance );
LIBVLC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *p_libvlc_instance );
/**
* Create a Media Player object from a Media
......@@ -123,7 +123,7 @@ VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_
* destroyed.
* \return a new media player object, or NULL on error.
*/
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *p_md );
LIBVLC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *p_md );
/**
* Release a media_player after use
......@@ -134,7 +134,7 @@ VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvl
*
* \param p_mi the Media Player to free
*/
VLC_PUBLIC_API void libvlc_media_player_release( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_release( libvlc_media_player_t *p_mi );
/**
* Retain a reference to a media player object. Use
......@@ -142,7 +142,7 @@ VLC_PUBLIC_API void libvlc_media_player_release( libvlc_media_player_t *p_mi );
*
* \param p_mi media player object
*/
VLC_PUBLIC_API void libvlc_media_player_retain( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_retain( libvlc_media_player_t *p_mi );
/**
* Set the media that will be used by the media_player. If any,
......@@ -152,7 +152,7 @@ VLC_PUBLIC_API void libvlc_media_player_retain( libvlc_media_player_t *p_mi );
* \param p_md the Media. Afterwards the p_md can be safely
* destroyed.
*/
VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_media_player_set_media( libvlc_media_player_t *p_mi,
libvlc_media_t *p_md );
/**
......@@ -162,7 +162,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *p_mi,
* \return the media associated with p_mi, or NULL if no
* media is associated
*/
VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t *p_mi );
/**
* Get the Event Manager from which the media player send event.
......@@ -170,7 +170,7 @@ VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_play
* \param p_mi the Media Player
* \return the event manager associated with p_mi
*/
VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t *p_mi );
/**
* is_playing
......@@ -178,7 +178,7 @@ VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libv
* \param p_mi the Media Player
* \return 1 if the media player is playing, 0 otherwise
*/
VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_is_playing ( libvlc_media_player_t *p_mi );
/**
* Play
......@@ -186,7 +186,7 @@ VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t *p_mi
* \param p_mi the Media Player
* \return 0 if playback started (and was already started), or -1 on error.
*/
VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi );
/**
* Pause or resume (no effect if there is no media)
......@@ -195,7 +195,7 @@ VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t *p_mi );
* \param do_pause play/resume if zero, pause if non-zero
* \version LibVLC 1.1.1 or later
*/
VLC_PUBLIC_API void libvlc_media_player_set_pause ( libvlc_media_player_t *mp,
LIBVLC_API void libvlc_media_player_set_pause ( libvlc_media_player_t *mp,
int do_pause );
/**
......@@ -203,14 +203,14 @@ VLC_PUBLIC_API void libvlc_media_player_set_pause ( libvlc_media_player_t *mp,
*
* \param p_mi the Media Player
*/
VLC_PUBLIC_API void libvlc_media_player_pause ( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_pause ( libvlc_media_player_t *p_mi );
/**
* Stop (no effect if there is no media)
*
* \param p_mi the Media Player
*/
VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_stop ( libvlc_media_player_t *p_mi );
/**
* Callback prototype to allocate and lock a picture buffer.
......@@ -312,7 +312,7 @@ typedef void (*libvlc_video_cleanup_cb)(void *opaque);
* \param opaque private pointer for the three callbacks (as first parameter)
* \version LibVLC 1.1.1 or later
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_callbacks( libvlc_media_player_t *mp,
libvlc_video_lock_cb lock,
libvlc_video_unlock_cb unlock,
......@@ -335,7 +335,7 @@ void libvlc_video_set_callbacks( libvlc_media_player_t *mp,
* To use the YCbCr color space with chrominance subsampling,
* consider using libvlc_video_set_format_callbacks() instead.
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma,
unsigned width, unsigned height,
unsigned pitch );
......@@ -349,7 +349,7 @@ void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma,
* \param cleanup callback to release any allocated resources (or NULL)
* \version LibVLC 1.2.0 or later
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp,
libvlc_video_format_cb setup,
libvlc_video_cleanup_cb cleanup );
......@@ -388,7 +388,7 @@ void libvlc_video_set_format_callbacks( libvlc_media_player_t *mp,
* \param drawable the drawable that is either an NSView or an object following
* the VLCOpenGLVideoViewEmbedding protocol.
*/
VLC_PUBLIC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable );
LIBVLC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable );
/**
* Get the NSView handler previously set with libvlc_media_player_set_nsobject().
......@@ -396,7 +396,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_
* \param p_mi the Media Player
* \return the NSView handler or 0 if none where set
*/
VLC_PUBLIC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *p_mi );
LIBVLC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *p_mi );
/**
* Set the agl handler where the media player should render its video output.
......@@ -404,7 +404,7 @@ VLC_PUBLIC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *
* \param p_mi the Media Player
* \param drawable the agl handler
*/
VLC_PUBLIC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable );
LIBVLC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable );
/**
* Get the agl handler previously set with libvlc_media_player_set_agl().
......@@ -412,7 +412,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, u
* \param p_mi the Media Player
* \return the agl handler or 0 if none where set
*/
VLC_PUBLIC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi );
LIBVLC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi );
/**
* Set an X Window System drawable where the media player should render its
......@@ -428,7 +428,7 @@ VLC_PUBLIC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_m
* \param p_mi the Media Player
* \param drawable the ID of the X window
*/
VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable );
LIBVLC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable );
/**
* Get the X Window System window identifier previously set with
......@@ -439,7 +439,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_m
* \param p_mi the Media Player
* \return an X window ID, or 0 if none where set.
*/
VLC_PUBLIC_API uint32_t libvlc_media_player_get_xwindow ( libvlc_media_player_t *p_mi );
LIBVLC_API uint32_t libvlc_media_player_get_xwindow ( libvlc_media_player_t *p_mi );
/**
* Set a Win32/Win64 API window handle (HWND) where the media player should
......@@ -449,7 +449,7 @@ VLC_PUBLIC_API uint32_t libvlc_media_player_get_xwindow ( libvlc_media_player_t
* \param p_mi the Media Player
* \param drawable windows handle of the drawable
*/
VLC_PUBLIC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi, void *drawable );
LIBVLC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi, void *drawable );
/**
* Get the Windows API window handle (HWND) previously set with
......@@ -459,7 +459,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi,
* \param p_mi the Media Player
* \return a window handle or NULL if there are none.
*/
VLC_PUBLIC_API void *libvlc_media_player_get_hwnd ( libvlc_media_player_t *p_mi );
LIBVLC_API void *libvlc_media_player_get_hwnd ( libvlc_media_player_t *p_mi );
......@@ -471,7 +471,7 @@ VLC_PUBLIC_API void *libvlc_media_player_get_hwnd ( libvlc_media_player_t *p_mi
* \param p_mi the Media Player
* \return the movie length (in ms), or -1 if there is no media.
*/
VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_length( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_time_t libvlc_media_player_get_length( libvlc_media_player_t *p_mi );
/**
* Get the current movie time (in ms).
......@@ -479,7 +479,7 @@ VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_length( libvlc_media_player
* \param p_mi the Media Player
* \return the movie time (in ms), or -1 if there is no media.
*/
VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi );
/**
* Set the movie time (in ms). This has no effect if no media is being played.
......@@ -488,7 +488,7 @@ VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t
* \param p_mi the Media Player
* \param i_time the movie time (in ms).
*/
VLC_PUBLIC_API void libvlc_media_player_set_time( libvlc_media_player_t *p_mi, libvlc_time_t i_time );
LIBVLC_API void libvlc_media_player_set_time( libvlc_media_player_t *p_mi, libvlc_time_t i_time );
/**
* Get movie position.
......@@ -496,7 +496,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_time( libvlc_media_player_t *p_mi, l
* \param p_mi the Media Player
* \return movie position, or -1. in case of error
*/
VLC_PUBLIC_API float libvlc_media_player_get_position( libvlc_media_player_t *p_mi );
LIBVLC_API float libvlc_media_player_get_position( libvlc_media_player_t *p_mi );
/**
* Set movie position. This has no effect if playback is not enabled.
......@@ -505,7 +505,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_position( libvlc_media_player_t *p_
* \param p_mi the Media Player
* \param f_pos the position
*/
VLC_PUBLIC_API void libvlc_media_player_set_position( libvlc_media_player_t *p_mi, float f_pos );
LIBVLC_API void libvlc_media_player_set_position( libvlc_media_player_t *p_mi, float f_pos );
/**
* Set movie chapter (if applicable).
......@@ -513,7 +513,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_position( libvlc_media_player_t *p_m
* \param p_mi the Media Player
* \param i_chapter chapter number to play
*/
VLC_PUBLIC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *p_mi, int i_chapter );
LIBVLC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *p_mi, int i_chapter );
/**
* Get movie chapter.
......@@ -521,7 +521,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *p_mi
* \param p_mi the Media Player
* \return chapter number currently playing, or -1 if there is no media.
*/
VLC_PUBLIC_API int libvlc_media_player_get_chapter( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_get_chapter( libvlc_media_player_t *p_mi );
/**
* Get movie chapter count
......@@ -529,7 +529,7 @@ VLC_PUBLIC_API int libvlc_media_player_get_chapter( libvlc_media_player_t *p_mi
* \param p_mi the Media Player
* \return number of chapters in movie, or -1.
*/
VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t *p_mi );
/**
* Is the player able to play
......@@ -537,7 +537,7 @@ VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t
* \param p_mi the Media Player
* \return boolean
*/
VLC_PUBLIC_API int libvlc_media_player_will_play( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_will_play( libvlc_media_player_t *p_mi );
/**
* Get title chapter count
......@@ -546,7 +546,7 @@ VLC_PUBLIC_API int libvlc_media_player_will_play( libvlc_media_player_t *p_mi );
* \param i_title title
* \return number of chapters in title, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_chapter_count_for_title(
LIBVLC_API int libvlc_media_player_get_chapter_count_for_title(
libvlc_media_player_t *p_mi, int i_title );
/**
......@@ -555,7 +555,7 @@ VLC_PUBLIC_API int libvlc_media_player_get_chapter_count_for_title(
* \param p_mi the Media Player
* \param i_title title number to play
*/
VLC_PUBLIC_API void libvlc_media_player_set_title( libvlc_media_player_t *p_mi, int i_title );
LIBVLC_API void libvlc_media_player_set_title( libvlc_media_player_t *p_mi, int i_title );
/**
* Get movie title
......@@ -563,7 +563,7 @@ VLC_PUBLIC_API void libvlc_media_player_set_title( libvlc_media_player_t *p_mi,
* \param p_mi the Media Player
* \return title number currently playing, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_title( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_get_title( libvlc_media_player_t *p_mi );
/**
* Get movie title count
......@@ -571,21 +571,21 @@ VLC_PUBLIC_API int libvlc_media_player_get_title( libvlc_media_player_t *p_mi );
* \param p_mi the Media Player
* \return title number count, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_title_count( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_get_title_count( libvlc_media_player_t *p_mi );
/**
* Set previous chapter (if applicable)
*
* \param p_mi the Media Player
*/
VLC_PUBLIC_API void libvlc_media_player_previous_chapter( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_previous_chapter( libvlc_media_player_t *p_mi );
/**
* Set next chapter (if applicable)
*
* \param p_mi the Media Player
*/
VLC_PUBLIC_API void libvlc_media_player_next_chapter( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_next_chapter( libvlc_media_player_t *p_mi );
/**
* Get the requested movie play rate.
......@@ -595,7 +595,7 @@ VLC_PUBLIC_API void libvlc_media_player_next_chapter( libvlc_media_player_t *p_m
* \param p_mi the Media Player
* \return movie play rate
*/
VLC_PUBLIC_API float libvlc_media_player_get_rate( libvlc_media_player_t *p_mi );
LIBVLC_API float libvlc_media_player_get_rate( libvlc_media_player_t *p_mi );
/**
* Set movie play rate
......@@ -605,7 +605,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_rate( libvlc_media_player_t *p_mi )
* \return -1 if an error was detected, 0 otherwise (but even then, it might
* not actually work depending on the underlying media protocol)
*/
VLC_PUBLIC_API int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float rate );
LIBVLC_API int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float rate );
/**
* Get current movie state
......@@ -613,7 +613,7 @@ VLC_PUBLIC_API int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, fl
* \param p_mi the Media Player
* \return the current state of the media player (playing, paused, ...) \see libvlc_state_t
*/
VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi );
/**
* Get movie fps rate
......@@ -621,7 +621,7 @@ VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player
* \param p_mi the Media Player
* \return frames per second (fps) for this playing movie, or 0 if unspecified
*/
VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi );
LIBVLC_API float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi );
/** end bug */
......@@ -631,7 +631,7 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \return the number of video outputs
*/
VLC_PUBLIC_API unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi );
LIBVLC_API unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_mi );
/**
* Is this media player seekable?
......@@ -639,7 +639,7 @@ VLC_PUBLIC_API unsigned libvlc_media_player_has_vout( libvlc_media_player_t *p_m
* \param p_mi the media player
* \return true if the media player can seek
*/
VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi );
/**
* Can this media player be paused?
......@@ -647,7 +647,7 @@ VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi
* \param p_mi the media player
* \return true if the media player can pause
*/
VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi );
/**
......@@ -655,7 +655,7 @@ VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi );
*
* \param p_mi the media player
*/
VLC_PUBLIC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi );
/**
* Navigate through DVD Menu
......@@ -664,7 +664,7 @@ VLC_PUBLIC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi
* \param navigate the Navigation mode
* \version libVLC 1.2.0 or later
*/
VLC_PUBLIC_API void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
LIBVLC_API void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
unsigned navigate );
/**
......@@ -672,7 +672,7 @@ VLC_PUBLIC_API void libvlc_media_player_navigate( libvlc_media_player_t* p_mi,
*
* \param p_track_description the structure to release
*/
VLC_PUBLIC_API void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
LIBVLC_API void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
/** \defgroup libvlc_video LibVLC video controls
* @{
......@@ -686,7 +686,7 @@ VLC_PUBLIC_API void libvlc_track_description_release( libvlc_track_description_t
*
* \param p_mi the media player
*/
VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi );
/**
* Enable or disable fullscreen.
......@@ -701,7 +701,7 @@ VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \param b_fullscreen boolean for fullscreen status
*/
VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen );
LIBVLC_API void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen );
/**
* Get current fullscreen status.
......@@ -709,7 +709,7 @@ VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fu
* \param p_mi the media player
* \return the fullscreen status (boolean)
*/
VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_get_fullscreen( libvlc_media_player_t *p_mi );
/**
* Enable or disable key press events handling, according to the LibVLC hotkeys
......@@ -726,7 +726,7 @@ VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \param on true to handle key press events, false to ignore them.
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on );
/**
......@@ -741,7 +741,7 @@ void libvlc_video_set_key_input( libvlc_media_player_t *p_mi, unsigned on );
* \param p_mi the media player
* \param on true to handle mouse click events, false to ignore them.
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on );
/**
......@@ -753,7 +753,7 @@ void libvlc_video_set_mouse_input( libvlc_media_player_t *p_mi, unsigned on );
* \param py pointer to get the pixel height [OUT]
* \return 0 on success, -1 if the specified video does not exist
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
unsigned *px, unsigned *py );
......@@ -764,7 +764,7 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
* \param p_mi the media player
* \return the video pixel height or 0 if not applicable
*/
VLC_DEPRECATED_API
LIBVLC_DEPRECATED
int libvlc_video_get_height( libvlc_media_player_t *p_mi );
/**
......@@ -774,7 +774,7 @@ int libvlc_video_get_height( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \return the video pixel width or 0 if not applicable
*/
VLC_DEPRECATED_API
LIBVLC_DEPRECATED
int libvlc_video_get_width( libvlc_media_player_t *p_mi );
/**
......@@ -799,7 +799,7 @@ int libvlc_video_get_width( libvlc_media_player_t *p_mi );
* \param py pointer to get the ordinate [OUT]
* \return 0 on success, -1 if the specified video does not exist
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_video_get_cursor( libvlc_media_player_t *p_mi, unsigned num,
int *px, int *py );
......@@ -811,7 +811,7 @@ int libvlc_video_get_cursor( libvlc_media_player_t *p_mi, unsigned num,
* \return the currently configured zoom factor, or 0. if the video is set
* to fit to the output window/drawable automatically.
*/
VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t *p_mi );
LIBVLC_API float libvlc_video_get_scale( libvlc_media_player_t *p_mi );
/**
* Set the video scaling factor. That is the ratio of the number of pixels on
......@@ -824,7 +824,7 @@ VLC_PUBLIC_API float libvlc_video_get_scale( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \param f_factor the scaling factor, or zero
*/
VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *p_mi, float f_factor );
LIBVLC_API void libvlc_video_set_scale( libvlc_media_player_t *p_mi, float f_factor );
/**
* Get current video aspect ratio.
......@@ -833,7 +833,7 @@ VLC_PUBLIC_API void libvlc_video_set_scale( libvlc_media_player_t *p_mi, float f
* \return the video aspect ratio or NULL if unspecified
* (the result must be released with free() or libvlc_free()).
*/
VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi );
LIBVLC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi );
/**
* Set new video aspect ratio.
......@@ -842,7 +842,7 @@ VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi
* \param psz_aspect new video aspect-ratio or NULL to reset to default
* \note Invalid aspect ratios are ignored.
*/
VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, const char *psz_aspect );
LIBVLC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi, const char *psz_aspect );
/**
* Get current video subtitle.
......@@ -850,7 +850,7 @@ VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
* \param p_mi the media player
* \return the video subtitle selected, or -1 if none
*/
VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_get_spu( libvlc_media_player_t *p_mi );
/**
* Get the number of available video subtitles.
......@@ -858,7 +858,7 @@ VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \return the number of available video subtitles
*/
VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi );
/**
* Get the description of available video subtitles.
......@@ -866,7 +866,7 @@ VLC_PUBLIC_API int libvlc_video_get_spu_count( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \return list containing description of available video subtitles
*/
VLC_PUBLIC_API libvlc_track_description_t *
LIBVLC_API libvlc_track_description_t *
libvlc_video_get_spu_description( libvlc_media_player_t *p_mi );
/**
......@@ -876,7 +876,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \param i_spu new video subtitle to select
* \return 0 on success, -1 if out of range
*/
VLC_PUBLIC_API int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu );
LIBVLC_API int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i_spu );
/**
* Set new video subtitle file.
......@@ -885,7 +885,7 @@ VLC_PUBLIC_API int libvlc_video_set_spu( libvlc_media_player_t *p_mi, unsigned i
* \param psz_subtitle new video subtitle file
* \return the success status (boolean)
*/
VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, const char *psz_subtitle );
LIBVLC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi, const char *psz_subtitle );
/**
* Get the description of available titles.
......@@ -893,7 +893,7 @@ VLC_PUBLIC_API int libvlc_video_set_subtitle_file( libvlc_media_player_t *p_mi,
* \param p_mi the media player
* \return list containing description of available titles
*/
VLC_PUBLIC_API libvlc_track_description_t *
LIBVLC_API libvlc_track_description_t *
libvlc_video_get_title_description( libvlc_media_player_t *p_mi );
/**
......@@ -903,7 +903,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \param i_title selected title
* \return list containing description of available chapter for title i_title
*/
VLC_PUBLIC_API libvlc_track_description_t *
LIBVLC_API libvlc_track_description_t *
libvlc_video_get_chapter_description( libvlc_media_player_t *p_mi, int i_title );
/**
......@@ -912,7 +912,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \param p_mi the media player
* \return the crop filter geometry or NULL if unset
*/
VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi );
LIBVLC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi );
/**
* Set new crop filter geometry.
......@@ -920,7 +920,7 @@ VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi
* \param p_mi the media player
* \param psz_geometry new crop filter geometry (NULL to unset)
*/
VLC_PUBLIC_API
LIBVLC_API
void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, const char *psz_geometry );
/**
......@@ -929,7 +929,7 @@ void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi, const char *ps
* \param p_mi the media player
* \return the current teletext page requested.
*/
VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_get_teletext( libvlc_media_player_t *p_mi );
/**
* Set new teletext page to retrieve.
......@@ -937,14 +937,14 @@ VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_player_t *p_mi );
* \param p_mi the media player
* \param i_page teletex page number requested
*/
VLC_PUBLIC_API void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page );
LIBVLC_API void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page );
/**
* Toggle teletext transparent status on video output.
*
* \param p_mi the media player
*/
VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_toggle_teletext( libvlc_media_player_t *p_mi );
/**
* Get number of available video tracks.
......@@ -952,7 +952,7 @@ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \return the number of available video tracks (int)
*/
VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_get_track_count( libvlc_media_player_t *p_mi );
/**
* Get the description of available video tracks.
......@@ -960,7 +960,7 @@ VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \return list with description of available video tracks, or NULL on error
*/
VLC_PUBLIC_API libvlc_track_description_t *
LIBVLC_API libvlc_track_description_t *
libvlc_video_get_track_description( libvlc_media_player_t *p_mi );
/**
......@@ -969,7 +969,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \param p_mi media player
* \return the video track (int) or -1 if none
*/
VLC_PUBLIC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi );
/**
* Set video track.
......@@ -978,7 +978,7 @@ VLC_PUBLIC_API int libvlc_video_get_track( libvlc_media_player_t *p_mi );
* \param i_track the track (int)
* \return 0 on success, -1 if out of range
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track );
/**
......@@ -994,7 +994,7 @@ int libvlc_video_set_track( libvlc_media_player_t *p_mi, int i_track );
* \param i_height the snapshot's height
* \return 0 on success, -1 if the video was not found
*/
VLC_PUBLIC_API
LIBVLC_API
int libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
const char *psz_filepath, unsigned int i_width,
unsigned int i_height );
......@@ -1005,7 +1005,7 @@ int libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
* \param p_mi libvlc media player
* \param psz_mode type of deinterlace filter, NULL to disable
*/
VLC_PUBLIC_API void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
const char *psz_mode );
/**
......@@ -1014,7 +1014,7 @@ VLC_PUBLIC_API void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
* \param p_mi libvlc media player
* \param option marq option to get \see libvlc_video_marquee_int_option_t
*/
VLC_PUBLIC_API int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
LIBVLC_API int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
unsigned option );
/**
......@@ -1023,7 +1023,7 @@ VLC_PUBLIC_API int libvlc_video_get_marquee_int( libvlc_media_player_t *p_mi,
* \param p_mi libvlc media player
* \param option marq option to get \see libvlc_video_marquee_string_option_t
*/
VLC_PUBLIC_API char *libvlc_video_get_marquee_string( libvlc_media_player_t *p_mi,
LIBVLC_API char *libvlc_video_get_marquee_string( libvlc_media_player_t *p_mi,
unsigned option );
/**
......@@ -1036,7 +1036,7 @@ VLC_PUBLIC_API char *libvlc_video_get_marquee_string( libvlc_media_player_t *p_m
* \param option marq option to set \see libvlc_video_marquee_int_option_t
* \param i_val marq option value
*/
VLC_PUBLIC_API void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
unsigned option, int i_val );
/**
......@@ -1046,7 +1046,7 @@ VLC_PUBLIC_API void libvlc_video_set_marquee_int( libvlc_media_player_t *p_mi,
* \param option marq option to set \see libvlc_video_marquee_string_option_t
* \param psz_text marq option value
*/
VLC_PUBLIC_API void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_marquee_string( libvlc_media_player_t *p_mi,
unsigned option, const char *psz_text );
/** option values for libvlc_video_{get,set}_logo_{int,string} */
......@@ -1067,7 +1067,7 @@ enum libvlc_video_logo_option_t {
* \param p_mi libvlc media player instance
* \param option logo option to get, values of libvlc_video_logo_option_t
*/
VLC_PUBLIC_API int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi,
LIBVLC_API int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi,
unsigned option );
/**
......@@ -1080,7 +1080,7 @@ VLC_PUBLIC_API int libvlc_video_get_logo_int( libvlc_media_player_t *p_mi,
* \param option logo option to set, values of libvlc_video_logo_option_t
* \param value logo option value
*/
VLC_PUBLIC_API void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
unsigned option, int value );
/**
......@@ -1091,7 +1091,7 @@ VLC_PUBLIC_API void libvlc_video_set_logo_int( libvlc_media_player_t *p_mi,
* \param option logo option to set, values of libvlc_video_logo_option_t
* \param psz_value logo option value
*/
VLC_PUBLIC_API void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_logo_string( libvlc_media_player_t *p_mi,
unsigned option, const char *psz_value );
......@@ -1112,7 +1112,7 @@ enum libvlc_video_adjust_option_t {
* \param option adjust option to get, values of libvlc_video_adjust_option_t
* \version LibVLC 1.1.1 and later.
*/
VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
LIBVLC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
unsigned option );
/**
......@@ -1126,7 +1126,7 @@ VLC_PUBLIC_API int libvlc_video_get_adjust_int( libvlc_media_player_t *p_mi,
* \param value adjust option value
* \version LibVLC 1.1.1 and later.
*/
VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
unsigned option, int value );
/**
......@@ -1136,7 +1136,7 @@ VLC_PUBLIC_API void libvlc_video_set_adjust_int( libvlc_media_player_t *p_mi,
* \param option adjust option to get, values of libvlc_video_adjust_option_t
* \version LibVLC 1.1.1 and later.
*/
VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
unsigned option );
/**
......@@ -1148,7 +1148,7 @@ VLC_PUBLIC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
* \param value adjust option value
* \version LibVLC 1.1.1 and later.
*/
VLC_PUBLIC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
unsigned option, float value );
/** @} video */
......@@ -1193,7 +1193,7 @@ typedef enum libvlc_audio_output_channel_t {
* \see libvlc_audio_output_list_release \see libvlc_audio_output_t .
* In case of error, NULL is returned.
*/
VLC_PUBLIC_API libvlc_audio_output_t *
LIBVLC_API libvlc_audio_output_t *
libvlc_audio_output_list_get( libvlc_instance_t *p_instance );
/**
......@@ -1201,7 +1201,7 @@ VLC_PUBLIC_API libvlc_audio_output_t *
*
* \param p_list list with audio outputs for release
*/
VLC_PUBLIC_API void libvlc_audio_output_list_release( libvlc_audio_output_t *p_list );
LIBVLC_API void libvlc_audio_output_list_release( libvlc_audio_output_t *p_list );
/**
* Set the audio output.
......@@ -1212,7 +1212,7 @@ VLC_PUBLIC_API void libvlc_audio_output_list_release( libvlc_audio_output_t *p_l
* use psz_name of \see libvlc_audio_output_t
* \return true if function succeded
*/
VLC_PUBLIC_API int libvlc_audio_output_set( libvlc_media_player_t *p_mi,
LIBVLC_API int libvlc_audio_output_set( libvlc_media_player_t *p_mi,
const char *psz_name );
/**
......@@ -1223,7 +1223,7 @@ VLC_PUBLIC_API int libvlc_audio_output_set( libvlc_media_player_t *p_mi,
* \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
* \return number of devices
*/
VLC_PUBLIC_API int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
const char *psz_audio_output );
/**
......@@ -1234,7 +1234,7 @@ VLC_PUBLIC_API int libvlc_audio_output_device_count( libvlc_instance_t *p_instan
* \param i_device device index
* \return long name of device
*/
VLC_PUBLIC_API char * libvlc_audio_output_device_longname( libvlc_instance_t *p_instance,
LIBVLC_API char * libvlc_audio_output_device_longname( libvlc_instance_t *p_instance,
const char *psz_audio_output,
int i_device );
......@@ -1246,7 +1246,7 @@ VLC_PUBLIC_API char * libvlc_audio_output_device_longname( libvlc_instance_t *p_
* \param i_device device index
* \return id name of device, use for setting device, need to be free after use
*/
VLC_PUBLIC_API char * libvlc_audio_output_device_id( libvlc_instance_t *p_instance,
LIBVLC_API char * libvlc_audio_output_device_id( libvlc_instance_t *p_instance,
const char *psz_audio_output,
int i_device );
......@@ -1257,7 +1257,7 @@ VLC_PUBLIC_API char * libvlc_audio_output_device_id( libvlc_instance_t *p_instan
* \param psz_audio_output - name of audio output, \see libvlc_audio_output_t
* \param psz_device_id device
*/
VLC_PUBLIC_API void libvlc_audio_output_device_set( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_audio_output_device_set( libvlc_media_player_t *p_mi,
const char *psz_audio_output,
const char *psz_device_id );
......@@ -1268,7 +1268,7 @@ VLC_PUBLIC_API void libvlc_audio_output_device_set( libvlc_media_player_t *p_mi,
* \param p_mi media player
* \return the audio devices type \see libvlc_audio_output_device_types_t
*/
VLC_PUBLIC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
/**
* Set current audio device type.
......@@ -1277,7 +1277,7 @@ VLC_PUBLIC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p
* \param device_type the audio device type,
according to \see libvlc_audio_output_device_types_t
*/
VLC_PUBLIC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *p_mi,
LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *p_mi,
int device_type );
......@@ -1286,7 +1286,7 @@ VLC_PUBLIC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *
*
* \param p_mi media player
*/
VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_media_player_t *p_mi );
LIBVLC_API void libvlc_audio_toggle_mute( libvlc_media_player_t *p_mi );
/**
* Get current mute status.
......@@ -1294,7 +1294,7 @@ VLC_PUBLIC_API void libvlc_audio_toggle_mute( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \return the mute status (boolean)
*/
VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_get_mute( libvlc_media_player_t *p_mi );
/**
* Set mute status.
......@@ -1302,7 +1302,7 @@ VLC_PUBLIC_API int libvlc_audio_get_mute( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \param status If status is true then mute, otherwise unmute
*/
VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_media_player_t *p_mi, int status );
LIBVLC_API void libvlc_audio_set_mute( libvlc_media_player_t *p_mi, int status );
/**
* Get current audio level.
......@@ -1310,7 +1310,7 @@ VLC_PUBLIC_API void libvlc_audio_set_mute( libvlc_media_player_t *p_mi, int stat
* \param p_mi media player
* \return the audio level (int)
*/
VLC_PUBLIC_API int libvlc_audio_get_volume( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_get_volume( libvlc_media_player_t *p_mi );
/**
* Set current audio level.
......@@ -1319,7 +1319,7 @@ VLC_PUBLIC_API int libvlc_audio_get_volume( libvlc_media_player_t *p_mi );
* \param i_volume the volume (int)
* \return 0 if the volume was set, -1 if it was out of range
*/
VLC_PUBLIC_API int libvlc_audio_set_volume( libvlc_media_player_t *p_mi, int i_volume );
LIBVLC_API int libvlc_audio_set_volume( libvlc_media_player_t *p_mi, int i_volume );
/**
* Get number of available audio tracks.
......@@ -1327,7 +1327,7 @@ VLC_PUBLIC_API int libvlc_audio_set_volume( libvlc_media_player_t *p_mi, int i_v
* \param p_mi media player
* \return the number of available audio tracks (int), or -1 if unavailable
*/
VLC_PUBLIC_API int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi );
/**
* Get the description of available audio tracks.
......@@ -1335,7 +1335,7 @@ VLC_PUBLIC_API int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi );
* \param p_mi media player
* \return list with description of available audio tracks, or NULL
*/
VLC_PUBLIC_API libvlc_track_description_t *
LIBVLC_API libvlc_track_description_t *
libvlc_audio_get_track_description( libvlc_media_player_t *p_mi );
/**
......@@ -1344,7 +1344,7 @@ VLC_PUBLIC_API libvlc_track_description_t *
* \param p_mi media player
* \return the audio track (int), or -1 if none.
*/
VLC_PUBLIC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi );
/**
* Set current audio track.
......@@ -1353,7 +1353,7 @@ VLC_PUBLIC_API int libvlc_audio_get_track( libvlc_media_player_t *p_mi );
* \param i_track the track (int)
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track );
LIBVLC_API int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track );
/**
* Get current audio channel.
......@@ -1361,7 +1361,7 @@ VLC_PUBLIC_API int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_tr
* \param p_mi media player
* \return the audio channel \see libvlc_audio_output_channel_t
*/
VLC_PUBLIC_API int libvlc_audio_get_channel( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_get_channel( libvlc_media_player_t *p_mi );
/**
* Set current audio channel.
......@@ -1370,7 +1370,7 @@ VLC_PUBLIC_API int libvlc_audio_get_channel( libvlc_media_player_t *p_mi );
* \param channel the audio channel, \see libvlc_audio_output_channel_t
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_audio_set_channel( libvlc_media_player_t *p_mi, int channel );
LIBVLC_API int libvlc_audio_set_channel( libvlc_media_player_t *p_mi, int channel );
/**
* Get current audio delay.
......@@ -1379,7 +1379,7 @@ VLC_PUBLIC_API int libvlc_audio_set_channel( libvlc_media_player_t *p_mi, int ch
* \return the audio delay (microseconds)
* \version LibVLC 1.1.1 or later
*/
VLC_PUBLIC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
/**
* Set current audio delay. The audio delay will be reset to zero each time the media changes.
......@@ -1389,7 +1389,7 @@ VLC_PUBLIC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
* \return 0 on success, -1 on error
* \version LibVLC 1.1.1 or later
*/
VLC_PUBLIC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
LIBVLC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
/** @} audio */
......
include/vlc/libvlc_vlm.h
View file @ 6a065215
......@@ -48,7 +48,7 @@ extern "C" {
*
* \param p_instance the instance
*/
VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t *p_instance );
LIBVLC_API void libvlc_vlm_release( libvlc_instance_t *p_instance );
/**
* Add a broadcast, with one input.
......@@ -63,7 +63,7 @@ VLC_PUBLIC_API void libvlc_vlm_release( libvlc_instance_t *p_instance );
* \param b_loop Should this broadcast be played in loop ?
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance,
const char *psz_name, const char *psz_input,
const char *psz_output, int i_options,
const char * const* ppsz_options,
......@@ -81,7 +81,7 @@ VLC_PUBLIC_API int libvlc_vlm_add_broadcast( libvlc_instance_t *p_instance,
* \param psz_mux the muxer of the vod media
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_add_vod( libvlc_instance_t * p_instance,
LIBVLC_API int libvlc_vlm_add_vod( libvlc_instance_t * p_instance,
const char *psz_name, const char *psz_input,
int i_options, const char * const* ppsz_options,
int b_enabled, const char *psz_mux );
......@@ -93,7 +93,7 @@ VLC_PUBLIC_API int libvlc_vlm_add_vod( libvlc_instance_t * p_instance,
* \param psz_name the media to delete
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_del_media( libvlc_instance_t * p_instance,
LIBVLC_API int libvlc_vlm_del_media( libvlc_instance_t * p_instance,
const char *psz_name );
/**
......@@ -104,7 +104,7 @@ VLC_PUBLIC_API int libvlc_vlm_del_media( libvlc_instance_t * p_instance,
* \param b_enabled the new status
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_set_enabled( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_set_enabled( libvlc_instance_t *p_instance,
const char *psz_name, int b_enabled );
/**
......@@ -115,7 +115,7 @@ VLC_PUBLIC_API int libvlc_vlm_set_enabled( libvlc_instance_t *p_instance,
* \param psz_output the output MRL (the parameter to the "sout" variable)
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_set_output( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_set_output( libvlc_instance_t *p_instance,
const char *psz_name,
const char *psz_output );
......@@ -128,7 +128,7 @@ VLC_PUBLIC_API int libvlc_vlm_set_output( libvlc_instance_t *p_instance,
* \param psz_input the input MRL
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_set_input( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_set_input( libvlc_instance_t *p_instance,
const char *psz_name,
const char *psz_input );
......@@ -140,7 +140,7 @@ VLC_PUBLIC_API int libvlc_vlm_set_input( libvlc_instance_t *p_instance,
* \param psz_input the input MRL
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_add_input( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_add_input( libvlc_instance_t *p_instance,
const char *psz_name,
const char *psz_input );
......@@ -152,7 +152,7 @@ VLC_PUBLIC_API int libvlc_vlm_add_input( libvlc_instance_t *p_instance,
* \param b_loop the new status
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_set_loop( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_set_loop( libvlc_instance_t *p_instance,
const char *psz_name,
int b_loop );
......@@ -164,7 +164,7 @@ VLC_PUBLIC_API int libvlc_vlm_set_loop( libvlc_instance_t *p_instance,
* \param psz_mux the new muxer
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_set_mux( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_set_mux( libvlc_instance_t *p_instance,
const char *psz_name,
const char *psz_mux );
......@@ -182,7 +182,7 @@ VLC_PUBLIC_API int libvlc_vlm_set_mux( libvlc_instance_t *p_instance,
* \param b_loop Should this broadcast be played in loop ?
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_change_media( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_change_media( libvlc_instance_t *p_instance,
const char *psz_name, const char *psz_input,
const char *psz_output, int i_options,
const char * const *ppsz_options,
......@@ -195,7 +195,7 @@ VLC_PUBLIC_API int libvlc_vlm_change_media( libvlc_instance_t *p_instance,
* \param psz_name the name of the broadcast
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_play_media ( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_play_media ( libvlc_instance_t *p_instance,
const char *psz_name );
/**
......@@ -205,7 +205,7 @@ VLC_PUBLIC_API int libvlc_vlm_play_media ( libvlc_instance_t *p_instance,
* \param psz_name the name of the broadcast
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_stop_media ( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_stop_media ( libvlc_instance_t *p_instance,
const char *psz_name );
/**
......@@ -215,7 +215,7 @@ VLC_PUBLIC_API int libvlc_vlm_stop_media ( libvlc_instance_t *p_instance,
* \param psz_name the name of the broadcast
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_pause_media( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_pause_media( libvlc_instance_t *p_instance,
const char *psz_name );
/**
......@@ -226,7 +226,7 @@ VLC_PUBLIC_API int libvlc_vlm_pause_media( libvlc_instance_t *p_instance,
* \param f_percentage the percentage to seek to
* \return 0 on success, -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_seek_media( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_seek_media( libvlc_instance_t *p_instance,
const char *psz_name,
float f_percentage );
......@@ -246,7 +246,7 @@ VLC_PUBLIC_API int libvlc_vlm_seek_media( libvlc_instance_t *p_instance,
* if the name is an empty string, all media is described
* \return string with information about named media, or NULL on error
*/
VLC_PUBLIC_API const char* libvlc_vlm_show_media( libvlc_instance_t *p_instance,
LIBVLC_API const char* libvlc_vlm_show_media( libvlc_instance_t *p_instance,
const char *psz_name );
/**
......@@ -257,7 +257,7 @@ VLC_PUBLIC_API const char* libvlc_vlm_show_media( libvlc_instance_t *p_instance,
* \param i_instance instance id
* \return position as float or -1. on error
*/
VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance,
LIBVLC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance,
const char *psz_name,
int i_instance );
......@@ -269,7 +269,7 @@ VLC_PUBLIC_API float libvlc_vlm_get_media_instance_position( libvlc_instance_t *
* \param i_instance instance id
* \return time as integer or -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_instance,
const char *psz_name,
int i_instance );
......@@ -281,7 +281,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_time( libvlc_instance_t *p_inst
* \param i_instance instance id
* \return length of media item or -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_instance,
const char *psz_name,
int i_instance );
......@@ -293,7 +293,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_length( libvlc_instance_t *p_in
* \param i_instance instance id
* \return playback rate or -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance,
LIBVLC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_instance,
const char *psz_name,
int i_instance );
#if 0
......@@ -305,7 +305,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_rate( libvlc_instance_t *p_inst
* \param i_instance instance id
* \return title as number or -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *,
LIBVLC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *,
const char *, int );
/**
......@@ -316,7 +316,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_title( libvlc_instance_t *,
* \param i_instance instance id
* \return chapter as number or -1 on error
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *,
LIBVLC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *,
const char *, int );
/**
......@@ -327,7 +327,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_chapter( libvlc_instance_t *,
* \param i_instance instance id
* \return 1 if seekable, 0 if not, -1 if media does not exist
*/
VLC_PUBLIC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *,
LIBVLC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *,
const char *, int );
#endif
/**
......@@ -337,7 +337,7 @@ VLC_PUBLIC_API int libvlc_vlm_get_media_instance_seekable( libvlc_instance_t *,
* \param p_instance a libvlc instance
* \return libvlc_event_manager
*/
VLC_PUBLIC_API libvlc_event_manager_t *
LIBVLC_API libvlc_event_manager_t *
libvlc_vlm_get_event_manager( libvlc_instance_t *p_instance );
/** @} */
......
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