X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc%2Flibvlc.h;h=1fe6717d36229579f8fc41c9039d3f7fe2bc9b10;hb=7bb3c466e0fe245d35b00ee698cdbbd09027f9e6;hp=f4663eb28fe15e0bf38a1d40fd8aebe5b3135587;hpb=e996cbefaf0f8db55513071b9678242e0a7733da;p=vlc diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index f4663eb28f..1fe6717d36 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -88,15 +88,12 @@ VLC_PUBLIC_API int libvlc_exception_raised( const libvlc_exception_t *p_exception ); /** - * Raise an exception using a user-provided message. + * Raise an exception. * * \param p_exception the exception to raise - * \param psz_format the exception message format string - * \param ... the format string arguments */ VLC_PUBLIC_API void -libvlc_exception_raise( libvlc_exception_t *p_exception, - const char *psz_format, ... ); +libvlc_exception_raise( libvlc_exception_t *p_exception ); /** * Clear an exception object so it can be reused. @@ -106,16 +103,6 @@ libvlc_exception_raise( libvlc_exception_t *p_exception, */ VLC_PUBLIC_API void libvlc_exception_clear( libvlc_exception_t * ); -/** - * Get an exception's message. - * - * \param p_exception the exception to query - * \return the exception message or NULL if not applicable (exception not - * raised, for example) - */ -VLC_PUBLIC_API const char * -libvlc_exception_get_message( const libvlc_exception_t *p_exception ); - /**@} */ /***************************************************************************** @@ -135,14 +122,14 @@ libvlc_exception_get_message( const libvlc_exception_t *p_exception ); * @warning * This will be NULL if there was no error. */ -const char *libvlc_errmsg (void); +VLC_PUBLIC_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 overriden when a new error * occurs, and destroyed when the thread exits. */ -void libvlc_clearerr (void); +VLC_PUBLIC_API void libvlc_clearerr (void); /** * Sets the LibVLC error status and message for the current thread. @@ -267,6 +254,8 @@ VLC_PUBLIC_API struct vlc_object_t *libvlc_get_vlc_instance(libvlc_instance_t *p * Frees an heap allocation (char *) returned by a LibVLC API. * If you know you're using the same underlying C run-time as the LibVLC * implementation, then you can call ANSI C free() directly instead. + * + * \param ptr the pointer */ VLC_PUBLIC_API void libvlc_free( void *ptr ); @@ -385,7 +374,6 @@ VLC_PUBLIC_API void libvlc_log_close( libvlc_log_t *p_log ); * Returns the number of messages in a log instance. * * \param p_log libvlc log instance or NULL - * \param p_e an initialized exception pointer * \return number of log messages, 0 if p_log is NULL */ VLC_PUBLIC_API unsigned libvlc_log_count( const libvlc_log_t *p_log ); @@ -445,3 +433,5 @@ VLC_PUBLIC_API libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterat # endif #endif /* */ + +/** @} */