X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmessages.c;h=072023d71cb6929ac550e9f78579f34f9e6bf2e8;hb=c4df6204812f43d256441339fbddf055443ec176;hp=b30b51eb273ed084aaf30e91d6e564bd9eb5e767;hpb=c2251f25cb8fd59a3969aab2a0a8bd00ae67c820;p=vlc diff --git a/src/misc/messages.c b/src/misc/messages.c index b30b51eb27..072023d71c 100644 --- a/src/misc/messages.c +++ b/src/misc/messages.c @@ -1,10 +1,10 @@ /***************************************************************************** * messages.c: messages interface * This library provides an interface to the message queue to be used by other - * modules, especially intf modules. See config.h for output configuration. + * modules, especially intf modules. See vlc_config.h for output configuration. ***************************************************************************** - * Copyright (C) 1998-2002 VideoLAN - * $Id: messages.c,v 1.36 2003/12/03 23:01:48 sigmunau Exp $ + * Copyright (C) 1998-2005 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar @@ -21,32 +21,34 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ + +#include + #include /* required */ #include /* va_list for BSD */ #include /* malloc() */ #include /* strerror() */ -#include - #ifdef HAVE_FCNTL_H # 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() */ #endif +#include + #include "vlc_interface.h" +#include "charset.h" /***************************************************************************** * Local macros @@ -59,159 +61,166 @@ # define vlc_va_copy(dest,src) (dest)=(src) #endif +#define QUEUE(i) p_this->p_libvlc->msg_bank.queues[i] +#define LOCK_BANK vlc_mutex_lock( &p_this->p_libvlc->msg_bank.lock ); +#define UNLOCK_BANK vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock ); + /***************************************************************************** * Local prototypes *****************************************************************************/ -static void QueueMsg ( vlc_object_t *, int , const char *, +static void QueueMsg ( vlc_object_t *, int, int , const char *, const char *, va_list ); -static void FlushMsg ( msg_bank_t * ); +static void FlushMsg ( msg_queue_t * ); static void PrintMsg ( vlc_object_t *, msg_item_t * ); /** - * 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. + * Initialize messages queues + * This function initializes all message queues */ void __msg_Create( vlc_object_t *p_this ) { - /* Message queue initialization */ - vlc_mutex_init( p_this, &p_this->p_libvlc->msg_bank.lock ); - - p_this->p_libvlc->msg_bank.b_configured = VLC_FALSE; - p_this->p_libvlc->msg_bank.b_overflow = VLC_FALSE; - - p_this->p_libvlc->msg_bank.i_start = 0; - p_this->p_libvlc->msg_bank.i_stop = 0; - - p_this->p_libvlc->msg_bank.i_sub = 0; - p_this->p_libvlc->msg_bank.pp_sub = NULL; + vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) ); + +#define QUEUE_INIT(i) \ + vlc_mutex_init( p_this, &QUEUE(i).lock ); \ + QUEUE(i).b_overflow = VLC_FALSE; \ + QUEUE(i).i_id = i; \ + QUEUE(i).i_start = 0; \ + QUEUE(i).i_stop = 0; \ + QUEUE(i).i_sub = 0; \ + QUEUE(i).pp_sub = 0; + + QUEUE_INIT( 0 ); + QUEUE_INIT( 1 ); + +#undef QUEUE_INIT #ifdef UNDER_CE - p_this->p_libvlc->msg_bank.logfile = + QUEUE(MSG_QUEUE_NORMAL).logfile = CreateFile( L"vlc-log.txt", GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL ); - SetFilePointer( p_this->p_libvlc->msg_bank.logfile, 0, NULL, FILE_END ); + SetFilePointer( QUEUE(MSG_QUEUE_NORMAL).logfile, 0, NULL, FILE_END ); #endif } /** - * Flush the message queue + * Flush all message queues */ void __msg_Flush( vlc_object_t *p_this ) { - int i_index; - - vlc_mutex_lock( &p_this->p_libvlc->msg_bank.lock ); - - p_this->p_libvlc->msg_bank.b_configured = VLC_TRUE; - - for( i_index = p_this->p_libvlc->msg_bank.i_start; - i_index != p_this->p_libvlc->msg_bank.i_stop; - i_index = (i_index+1) % VLC_MSG_QSIZE ) + int i; + for( i = 0 ; i < NB_QUEUES ; i++ ) { - PrintMsg( p_this, &p_this->p_libvlc->msg_bank.msg[i_index] ); + vlc_mutex_lock( &QUEUE(i).lock ); + FlushMsg( &QUEUE(i) ); + vlc_mutex_unlock( &QUEUE(i).lock ); } - - FlushMsg( &p_this->p_libvlc->msg_bank ); - - vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.lock ); } /** - * Free resources allocated by msg_Create + * Destroy the message queues * - * This functions prints all messages remaining in queue, then free all the - * resources allocated by msg_Create. + * This functions prints all messages remaining in the queues, + * then frees all the allocated ressources * 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 ) + int i; + for( i = NB_QUEUES -1 ; i >= 0; i-- ) { - msg_Err( p_this, "stale interface subscribers" ); - } + if( QUEUE(i).i_sub ) + msg_Err( p_this, "stale interface subscribers" ); - /* Flush the queue */ - if( !p_this->p_libvlc->msg_bank.b_configured ) - { - msg_Flush( p_this ); - } - else - { - FlushMsg( &p_this->p_libvlc->msg_bank ); - } + FlushMsg( &QUEUE(i) ); #ifdef UNDER_CE - CloseHandle( p_this->p_libvlc->msg_bank.logfile ); + if( i == MSG_QUEUE_NORMAL ) + CloseHandle( QUEUE(MSG_QUEUE_NORMAL).logfile ); #endif - - /* Destroy lock */ - vlc_mutex_destroy( &p_this->p_libvlc->msg_bank.lock ); + /* Destroy lock */ + vlc_mutex_destroy( &QUEUE(i).lock ); + } + vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) ); } /** - * Subscribe to the message queue. + * Subscribe to a message queue. */ -msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this ) +msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i ) { - msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank; msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) ); - vlc_mutex_lock( &p_bank->lock ); + assert( i < NB_QUEUES ); - /* Add subscription to the list */ - INSERT_ELEM( p_bank->pp_sub, p_bank->i_sub, p_bank->i_sub, p_sub ); + LOCK_BANK; + vlc_mutex_lock( &QUEUE(i).lock ); - p_sub->i_start = p_bank->i_start; - p_sub->pi_stop = &p_bank->i_stop; + TAB_APPEND( QUEUE(i).i_sub, QUEUE(i).pp_sub, p_sub ); - p_sub->p_msg = p_bank->msg; - p_sub->p_lock = &p_bank->lock; + p_sub->i_start = QUEUE(i).i_start; + p_sub->pi_stop = &QUEUE(i).i_stop; + p_sub->p_msg = QUEUE(i).msg; + p_sub->p_lock = &QUEUE(i).lock; - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock( &QUEUE(i).lock ); + UNLOCK_BANK; return p_sub; } /** - * Unsubscribe from the message queue. + * Unsubscribe from a 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; - int i_index; - - vlc_mutex_lock( &p_bank->lock ); - - /* Sanity check */ - if( !p_bank->i_sub ) - { - msg_Err( p_this, "no subscriber in the list" ); - return; - } + int i,j; - /* Look for the appropriate subscription */ - for( i_index = 0; i_index < p_bank->i_sub; i_index++ ) + LOCK_BANK; + for( i = 0 ; i< NB_QUEUES ; i++ ) { - if( p_bank->pp_sub[ i_index ] == p_sub ) + vlc_mutex_lock( &QUEUE(i).lock ); + for( j = 0 ; j< QUEUE(i).i_sub ; j++ ) { - break; + if( QUEUE(i).pp_sub[j] == p_sub ) + { + REMOVE_ELEM( QUEUE(i).pp_sub, QUEUE(i).i_sub, j ); + if( p_sub ) free( p_sub ); + } } + vlc_mutex_unlock( & QUEUE(i).lock ); } + UNLOCK_BANK; +} - if( p_bank->pp_sub[ i_index ] != p_sub ) +const char *msg_GetObjectTypeName(int i_object_type ) +{ + switch( i_object_type ) { - msg_Err( p_this, "subscriber not found" ); - vlc_mutex_unlock( &p_bank->lock ); - return; + case VLC_OBJECT_ROOT: return "root"; + case VLC_OBJECT_LIBVLC: return "libvlc"; + case VLC_OBJECT_MODULE: return "module"; + case VLC_OBJECT_INTF: return "interface"; + case VLC_OBJECT_PLAYLIST: return "playlist"; + case VLC_OBJECT_ITEM: return "item"; + case VLC_OBJECT_INPUT: return "input"; + case VLC_OBJECT_DECODER: return "decoder"; + case VLC_OBJECT_PACKETIZER: return "packetizer"; + case VLC_OBJECT_ENCODER: return "encoder"; + case VLC_OBJECT_VOUT: return "video output"; + case VLC_OBJECT_AOUT: return "audio output"; + case VLC_OBJECT_SOUT: return "stream output"; + case VLC_OBJECT_HTTPD: return "http server"; + case VLC_OBJECT_HTTPD_HOST: return "http server"; + case VLC_OBJECT_DIALOGS: return "dialogs provider"; + case VLC_OBJECT_VLM: return "vlm"; + case VLC_OBJECT_ANNOUNCE: return "announce handler"; + case VLC_OBJECT_DEMUX: return "demuxer"; + case VLC_OBJECT_ACCESS: return "access"; + case VLC_OBJECT_META_ENGINE: return "meta engine"; + default: return "private"; } - - /* Remove this subscription */ - REMOVE_ELEM( p_bank->pp_sub, p_bank->i_sub, i_index ); - - vlc_mutex_unlock( &p_bank->lock ); } /***************************************************************************** @@ -219,23 +228,31 @@ void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub ) ***************************************************************************** * These functions queue a message for later printing. *****************************************************************************/ -void __msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module, +void __msg_Generic( vlc_object_t *p_this, int i_queue, int i_type, + const char *psz_module, const char *psz_format, ... ) { va_list args; va_start( args, psz_format ); - QueueMsg( p_this, i_type, psz_module, psz_format, args ); + QueueMsg( p_this, i_queue, i_type, psz_module, psz_format, args ); va_end( args ); } +void __msg_GenericVa( vlc_object_t *p_this, int i_queue, + int i_type, const char *psz_module, + const char *psz_format, va_list args ) +{ + QueueMsg( p_this, i_queue, 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( vlc_object_t *p_this, const char *psz_format, ... ) \ { \ va_list args; \ va_start( args, psz_format ); \ - QueueMsg( (vlc_object_t *)p_this, FN_TYPE, "unknown", \ + QueueMsg( (vlc_object_t *)p_this,MSG_QUEUE_NORMAL, FN_TYPE, "unknown", \ psz_format, args ); \ va_end( args ); \ } \ @@ -267,23 +284,31 @@ DECLARE_MSG_FN( __msg_Dbg, VLC_MSG_DBG ); * 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, +static void QueueMsg( vlc_object_t *p_this, int i_queue, int i_type, + const char *psz_module, const char *psz_format, va_list _args ) { - msg_bank_t * p_bank = &p_this->p_libvlc->msg_bank; /* message bank */ + int i_header_size; /* Size of the additionnal header */ + vlc_object_t *p_obj; char * psz_str = NULL; /* formatted message string */ + char * psz_header = NULL; va_list args; msg_item_t * p_item = NULL; /* pointer to message */ msg_item_t item; /* message in case of a full queue */ + msg_queue_t *p_queue; -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) +#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || 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) && !defined( SYS_BEOS ) + if( p_this == NULL || p_this->i_flags & OBJECT_FLAGS_QUIET || + (p_this->i_flags & OBJECT_FLAGS_NODBG && i_type == VLC_MSG_DBG) ) + { + return; + } + + /* Convert message to string */ +#if defined(HAVE_VASPRINTF) && !defined(__APPLE__) && !defined( SYS_BEOS ) vlc_va_copy( args, _args ); vasprintf( &psz_str, psz_format, args ); va_end( args ); @@ -293,35 +318,61 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, 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 ); + /* We should use utf8_vfprintf - but it calls malloc()... */ vfprintf( stderr, psz_format, args ); va_end( args ); - fprintf( stderr, "\n" ); + fputs( "\n", stderr ); return; } -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS) + i_header_size = 0; + p_obj = p_this; + while( p_obj != NULL ) + { + char *psz_old = NULL; + if( p_obj == NULL ) break; + if( p_obj->psz_header ) + { + i_header_size += strlen( p_obj->psz_header ) + 4; + if( psz_header ) + { + psz_old = strdup( psz_header ); + psz_header = (char*)realloc( psz_header, i_header_size ); + snprintf( psz_header, i_header_size , "[%s] %s", + p_obj->psz_header, psz_old ); + } + else + { + psz_header = (char *)malloc( i_header_size ); + snprintf( psz_header, i_header_size, "[%s]", + p_obj->psz_header ); + } + } + if( psz_old ) free( psz_old ); + p_obj = p_obj->p_parent; + } + +#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || 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 - /* Put message in queue */ - vlc_mutex_lock( &p_bank->lock ); + assert( i_queue < NB_QUEUES ); + LOCK_BANK; + p_queue = &QUEUE(i_queue) ; + vlc_mutex_lock( &p_queue->lock ); /* Check there is room in the queue for our message */ - if( p_bank->b_overflow ) + if( p_queue->b_overflow ) { - FlushMsg( p_bank ); + FlushMsg( p_queue ); - if( ((p_bank->i_stop - p_bank->i_start + 1) % VLC_MSG_QSIZE) == 0 ) + if( ((p_queue->i_stop - p_queue->i_start + 1) % VLC_MSG_QSIZE) == 0 ) { /* Still in overflow mode, print from a dummy item */ p_item = &item; @@ -329,39 +380,42 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, else { /* Pheeew, at last, there is room in the queue! */ - p_bank->b_overflow = VLC_FALSE; + p_queue->b_overflow = VLC_FALSE; } } - else if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 ) + else if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) { - FlushMsg( p_bank ); + FlushMsg( p_queue ); - if( ((p_bank->i_stop - p_bank->i_start + 2) % VLC_MSG_QSIZE) == 0 ) + if( ((p_queue->i_stop - p_queue->i_start + 2) % VLC_MSG_QSIZE) == 0 ) { - p_bank->b_overflow = VLC_TRUE; - - /* Put the overflow message in the queue */ - 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_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" ); - p_item->psz_msg = strdup( "message queue overflowed" ); - - PrintMsg( p_this, p_item ); - - /* We print from a dummy item */ - p_item = &item; + p_queue->b_overflow = VLC_TRUE; + + if( p_queue->i_id == MSG_QUEUE_NORMAL ) + { + /* Put the overflow message in the queue */ + p_item = p_queue->msg + p_queue->i_stop; + p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE; + + 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" ); + p_item->psz_msg = strdup( "message queue overflowed" ); + p_item->psz_header = NULL; + + PrintMsg( p_this, p_item ); + /* We print from a dummy item */ + p_item = &item; + } } } - if( !p_bank->b_overflow ) + if( !p_queue->b_overflow ) { /* Put the message in the queue */ - p_item = p_bank->msg + p_bank->i_stop; - p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE; + p_item = p_queue->msg + p_queue->i_stop; + p_queue->i_stop = (p_queue->i_stop + 1) % VLC_MSG_QSIZE; } /* Fill message information fields */ @@ -370,16 +424,23 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, p_item->i_object_type = p_this->i_object_type; p_item->psz_module = strdup( psz_module ); p_item->psz_msg = psz_str; + p_item->psz_header = psz_header; - PrintMsg( p_this, p_item ); + if( p_queue->i_id == MSG_QUEUE_NORMAL ) + PrintMsg( p_this, p_item ); - if( p_bank->b_overflow ) + if( p_queue->b_overflow ) { - free( p_item->psz_module ); - free( p_item->psz_msg ); + if( p_item->psz_module ) + free( p_item->psz_module ); + if( p_item->psz_msg ) + free( p_item->psz_msg ); + if( p_item->psz_header ) + free( p_item->psz_header ); } - vlc_mutex_unlock( &p_bank->lock ); + vlc_mutex_unlock ( &p_queue->lock ); + UNLOCK_BANK; } /* following functions are local */ @@ -390,50 +451,48 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module, * Print all messages remaining in queue. MESSAGE QUEUE MUST BE LOCKED, since * this function does not check the lock. *****************************************************************************/ -static void FlushMsg ( msg_bank_t *p_bank ) +static void FlushMsg ( msg_queue_t *p_queue ) { int i_index, i_start, i_stop; - /* Only flush the queue if it has been properly configured */ - if( !p_bank->b_configured ) - { - return; - } - /* Get the maximum message index that can be freed */ - i_stop = p_bank->i_stop; + i_stop = p_queue->i_stop; /* Check until which value we can free messages */ - for( i_index = 0; i_index < p_bank->i_sub; i_index++ ) + for( i_index = 0; i_index < p_queue->i_sub; i_index++ ) { - i_start = p_bank->pp_sub[ i_index ]->i_start; + i_start = p_queue->pp_sub[ i_index ]->i_start; /* If this subscriber is late, we don't free messages before * his i_start value, otherwise he'll miss messages */ if( ( i_start < i_stop - && (p_bank->i_stop <= i_start || i_stop <= p_bank->i_stop) ) + && (p_queue->i_stop <= i_start || i_stop <= p_queue->i_stop) ) || ( i_stop < i_start - && (i_stop <= p_bank->i_stop && p_bank->i_stop <= i_start) ) ) + && (i_stop <= p_queue->i_stop && p_queue->i_stop <= i_start) ) ) { i_stop = i_start; } } /* Free message data */ - for( i_index = p_bank->i_start; + for( i_index = p_queue->i_start; i_index != i_stop; i_index = (i_index+1) % VLC_MSG_QSIZE ) { - free( p_bank->msg[i_index].psz_msg ); - free( p_bank->msg[i_index].psz_module ); + if( p_queue->msg[i_index].psz_msg ) + free( p_queue->msg[i_index].psz_msg ); + if( p_queue->msg[i_index].psz_module ) + free( p_queue->msg[i_index].psz_module ); + if( p_queue->msg[i_index].psz_header ) + free( p_queue->msg[i_index].psz_header ); } /* Update the new start value */ - p_bank->i_start = i_index; + p_queue->i_start = i_index; } /***************************************************************************** - * PrintMsg: output a message item to stderr + * PrintMsg: output a standard message item to stderr ***************************************************************************** * Print a message to stderr, with colour formatting if needed. *****************************************************************************/ @@ -451,7 +510,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) #endif static const char * ppsz_type[4] = { "", " error", " warning", " debug" }; static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY }; - char *psz_object = "private"; + const char *psz_object; int i_type = p_item->i_type; switch( i_type ) @@ -470,25 +529,10 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) break; } - switch( p_item->i_object_type ) - { - case VLC_OBJECT_ROOT: psz_object = "root"; break; - case VLC_OBJECT_VLC: psz_object = "vlc"; break; - case VLC_OBJECT_MODULE: psz_object = "module"; break; - case VLC_OBJECT_INTF: psz_object = "interface"; break; - case VLC_OBJECT_PLAYLIST: psz_object = "playlist"; break; - 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; - } + psz_object = msg_GetObjectTypeName(p_item->i_object_type); #ifdef UNDER_CE -# define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.logfile, \ +# define CE_WRITE(str) WriteFile( QUEUE(MSG_QUEUE_NORMAL).logfile, \ str, strlen(str), &i_dummy, NULL ); CE_WRITE( p_item->psz_module ); CE_WRITE( " " ); @@ -497,22 +541,43 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item ) CE_WRITE( ": " ); CE_WRITE( p_item->psz_msg ); CE_WRITE( "\r\n" ); - FlushFileBuffers( p_this->p_libvlc->msg_bank.logfile ); + FlushFileBuffers( QUEUE(MSG_QUEUE_NORMAL).logfile ); #else /* Send the message to stderr */ if( p_this->p_libvlc->b_color ) { - fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s%s: %s%s" GRAY "\n", + if( p_item->psz_header ) + { + utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s %s%s: %s%s" GRAY + "\n", + p_item->i_object_id, p_item->psz_header, + p_item->psz_module, psz_object, + ppsz_type[i_type], ppsz_color[i_type], + p_item->psz_msg ); + } + else + { + utf8_fprintf( stderr, "[" GREEN "%.8i" GRAY "] %s %s%s: %s%s" GRAY "\n", p_item->i_object_id, p_item->psz_module, psz_object, ppsz_type[i_type], ppsz_color[i_type], p_item->psz_msg ); + } } else { - fprintf( stderr, "[%.8i] %s %s%s: %s\n", p_item->i_object_id, + if( p_item->psz_header ) + { + utf8_fprintf( stderr, "[%.8i] %s %s %s%s: %s\n", p_item->i_object_id, + p_item->psz_header, p_item->psz_module, + psz_object, ppsz_type[i_type], p_item->psz_msg ); + } + else + { + utf8_fprintf( stderr, "[%.8i] %s %s%s: %s\n", p_item->i_object_id, p_item->psz_module, psz_object, ppsz_type[i_type], p_item->psz_msg ); + } } # if defined(WIN32)