X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=80ddb1e6385392bb29d240155cd3459d8c13dd86;hb=6db8875a09ef1252fe497b915dc4af69973fc1a7;hp=40660fd4ffb0b2e01c7bc83238eed8f92202961a;hpb=8b13c2c5e05d4b5beaa10e3c1db359216a0b4e78;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index 40660fd4ff..80ddb1e638 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -3,8 +3,8 @@ * This library provides an interface to the message queue to be used by other * modules, especially intf modules. See config.h for output configuration. ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: messages.c,v 1.28 2002/12/30 17:36:01 gbazin Exp $ + * Copyright (C) 1998-2004 VideoLAN + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -38,15 +38,24 @@ # include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ #endif -#ifdef HAVE_ERRNO_H -# include /* errno */ -#endif +#include /* errno */ #ifdef HAVE_UNISTD_H -#include /* close(), write() */ +# include /* close(), write() */ #endif -#include "interface.h" +#include "vlc_interface.h" + +/***************************************************************************** + * Local macros + *****************************************************************************/ +#if defined(HAVE_VA_COPY) +# define vlc_va_copy(dest,src) va_copy(dest,src) +#elif defined(HAVE___VA_COPY) +# define vlc_va_copy(dest,src) __va_copy(dest,src) +#else +# define vlc_va_copy(dest,src) (dest)=(src) +#endif /***************************************************************************** * Local prototypes @@ -56,12 +65,12 @@ static void QueueMsg ( vlc_object_t *, int , const char *, static void FlushMsg ( msg_bank_t * ); static void PrintMsg ( vlc_object_t *, msg_item_t * ); -/***************************************************************************** - * msg_Create: initialize messages interface - ***************************************************************************** +/** + * Initialize messages interface + * * This functions has to be called before any call to other msg_* functions. * It set up the locks and the message queue if it is used. - *****************************************************************************/ + */ void __msg_Create( vlc_object_t *p_this ) { /* Message queue initialization */ @@ -85,9 +94,9 @@ void __msg_Create( vlc_object_t *p_this ) #endif } -/***************************************************************************** - * msg_Flush: flush the message queue - *****************************************************************************/ +/** + * Flush the message queue + */ void __msg_Flush( vlc_object_t *p_this ) { int i_index; @@ -108,13 +117,13 @@ void __msg_Flush( vlc_object_t *p_this ) vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock ); } -/***************************************************************************** - * msg_Destroy: free resources allocated by msg_Create - ***************************************************************************** +/** + * Free resources allocated by msg_Create + * * This functions prints all messages remaining in queue, then free all the * resources allocated by msg_Create. * No other messages interface functions should be called after this one. - *****************************************************************************/ + */ void __msg_Destroy( vlc_object_t *p_this ) { if( p_this->p_libvlc->msg_bank.i_sub ) @@ -140,9 +149,9 @@ void __msg_Destroy( vlc_object_t *p_this ) vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock ); } -/***************************************************************************** - * msg_Subscribe: subscribe to the message queue. - *****************************************************************************/ +/** + * Subscribe to the message queue. + */ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) { msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; @@ -164,9 +173,9 @@ msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) return p_sub; } -/***************************************************************************** - * msg_Unsubscribe: unsubscribe from the message queue. - *****************************************************************************/ +/** + * Unsubscribe from the message queue. + */ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) { msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; @@ -200,6 +209,8 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) /* Remove this subscription */ REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index ); + free( p_sub ); + vlc_mutex_unlock( &p_bank->lock ); } @@ -218,9 +229,15 @@ void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, va_end( args ); } +void __msg_GenericVa( vlc_object_t *p_this, int i_type, const char *psz_module, + const char *psz_format, va_list args ) +{ + QueueMsg( p_this, i_type, psz_module, psz_format, args ); +} + /* Generic functions used when variadic macros are not available. */ #define DECLARE_MSG_FN( FN_NAME, FN_TYPE ) \ - void FN_NAME( void *p_this, const char *psz_format, ... ) \ + void FN_NAME( vlc_object_t *p_this, const char *psz_format, ... ) \ { \ va_list args; \ va_start( args, psz_format ); \ @@ -229,56 +246,72 @@ void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, va_end( args ); \ } \ struct _ - +/** + * Output an informational message. + * \note Do not use this for debug messages + * \see input_AddInfo + */ DECLARE_MSG_FN( __msg_Info, VLC_MSG_INFO ); +/** + * Output an error message. + */ DECLARE_MSG_FN( __msg_Err, VLC_MSG_ERR ); +/** + * Output a waring message + */ DECLARE_MSG_FN( __msg_Warn, VLC_MSG_WARN ); +/** + * Output a debug message + */ DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG ); -/***************************************************************************** - * QueueMsg: add a message to a queue - ***************************************************************************** +/** + * Add a message to a queue + * * This function provides basic functionnalities to other msg_* functions. * It adds a message to a queue (after having printed all stored messages if it * is full). If the message can't be converted to string in memory, it issues * a warning. - *****************************************************************************/ + */ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, - const char *psz_format, va_list args ) + const char *psz_format, va_list _args ) { msg_bank_t * p_bank = &p_this->p_libvlc->msg_bank; /* message bank */ char * psz_str = NULL; /* formatted message string */ + va_list args; msg_item_t * p_item = NULL; /* pointer to message */ msg_item_t item; /* message in case of a full queue */ -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) +#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE; #endif /* * Convert message to string */ -#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) +#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) && !defined( SYS_BEOS ) + vlc_va_copy( args, _args ); vasprintf( &psz_str, psz_format, args ); + va_end( args ); #else psz_str = (char*) malloc( i_size * sizeof(char) ); #endif if( psz_str == NULL ) { -#ifdef HAVE_ERRNO_H fprintf( stderr, "main warning: can't store message (%s): ", strerror(errno) ); -#else - fprintf( stderr, "main warning: can't store message: " ); -#endif + vlc_va_copy( args, _args ); vfprintf( stderr, psz_format, args ); + va_end( args ); fprintf( stderr, "\n" ); return; } -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) +#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) + vlc_va_copy( args, _args ); vsnprintf( psz_str, i_size, psz_format, args ); + va_end( args ); psz_str[ i_size - 1 ] = 0; /* Just in case */ #endif @@ -313,7 +346,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, p_item = p_bank->msg + p_bank->i_stop; p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE; - p_item->i_type = VLC_MSG_ERR; + p_item->i_type = VLC_MSG_WARN; p_item->i_object_id = p_this->i_object_id; p_item->i_object_type = p_this->i_object_type; p_item->psz_module = strdup( "message" ); @@ -408,20 +441,12 @@ static void FlushMsg ( msg_bank_t *p_bank ) *****************************************************************************/ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) { -#ifndef WIN32 # define COL(x) "\033[" #x ";1m" # define RED COL(31) # define GREEN COL(32) # define YELLOW COL(33) # define WHITE COL(37) # define GRAY "\033[0m" -#else -# define RED "" -# define GREEN "" -# define YELLOW "" -# define WHITE "" -# define GRAY "" -#endif #ifdef UNDER_CE int i_dummy; @@ -457,9 +482,17 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) case VLC_OBJECT_ITEM: psz_object = "item"; break; case VLC_OBJECT_INPUT: psz_object = "input"; break; case VLC_OBJECT_DECODER: psz_object = "decoder"; break; + case VLC_OBJECT_PACKETIZER: psz_object = "packetizer"; break; + case VLC_OBJECT_ENCODER: psz_object = "encoder"; break; case VLC_OBJECT_VOUT: psz_object = "video output"; break; case VLC_OBJECT_AOUT: psz_object = "audio output"; break; case VLC_OBJECT_SOUT: psz_object = "stream output"; break; + case VLC_OBJECT_HTTPD: psz_object = "http daemon"; break; + case VLC_OBJECT_DIALOGS: psz_object = "dialogs provider"; break; + case VLC_OBJECT_VLM: psz_object = "vlm"; break; + case VLC_OBJECT_ANNOUNCE: psz_object = "announce handler"; break; + case VLC_OBJECT_DEMUX: psz_object = "demuxer"; break; + case VLC_OBJECT_ACCESS: psz_object = "access"; break; } #ifdef UNDER_CE