# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdarg.h> /* va_list for BSD */
#include <vlc_charset.h>
#include "../libvlc.h"
+typedef struct
+{
+ int i_code;
+ char * psz_message;
+} msg_context_t;
+
+static vlc_threadvar_t msg_context;
+static uintptr_t banks = 0;
+
/*****************************************************************************
* Local macros
*****************************************************************************/
static void FlushMsg ( msg_queue_t * );
static void PrintMsg ( vlc_object_t *, msg_item_t * );
+static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
+
/**
* Initialize messages queues
* This function initializes all message queues
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
vlc_mutex_init( &priv->msg_bank.lock );
vlc_mutex_init( &QUEUE.lock );
+ vlc_dictionary_init( &priv->msg_enabled_objects, 0 );
+ priv->msg_all_objects_enabled = true;
+
QUEUE.b_overflow = false;
QUEUE.i_start = 0;
QUEUE.i_stop = 0;
CREATE_ALWAYS, 0, NULL );
SetFilePointer( QUEUE.logfile, 0, NULL, FILE_END );
#endif
+
+ vlc_mutex_lock( &msg_stack_lock );
+ if( banks++ == 0 )
+ vlc_threadvar_create( &msg_context, NULL );
+ vlc_mutex_unlock( &msg_stack_lock );
}
/**
vlc_mutex_unlock( &QUEUE.lock );
}
+
+/**
+ * Object Printing selection
+ */
+static void const * kObjectPrintingEnabled = (void *) 1;
+static void const * kObjectPrintingDisabled = (void *) -1;
+
+void __msg_EnableObjectPrinting (vlc_object_t *p_this, char * psz_object)
+{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+ vlc_mutex_lock( &QUEUE.lock );
+ if( !strcmp(psz_object, "all") )
+ priv->msg_all_objects_enabled = true;
+ else
+ vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingEnabled );
+ vlc_mutex_unlock( &QUEUE.lock );
+}
+
+void __msg_DisableObjectPrinting (vlc_object_t *p_this, char * psz_object)
+{
+ libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
+ vlc_mutex_lock( &QUEUE.lock );
+ if( !strcmp(psz_object, "all") )
+ priv->msg_all_objects_enabled = false;
+ else
+ vlc_dictionary_insert( &priv->msg_enabled_objects, psz_object, (void *)kObjectPrintingDisabled );
+ vlc_mutex_unlock( &QUEUE.lock );
+}
+
/**
* Destroy the message queues
*
FlushMsg( &QUEUE );
+ vlc_mutex_lock( &msg_stack_lock );
+ if( --banks == 0 )
+ vlc_threadvar_delete( &msg_context );
+ vlc_mutex_unlock( &msg_stack_lock );
+
#ifdef UNDER_CE
CloseHandle( QUEUE.logfile );
#endif
+
+ vlc_dictionary_clear( &priv->msg_enabled_objects, NULL, NULL );
+
/* Destroy lock */
vlc_mutex_destroy( &QUEUE.lock );
vlc_mutex_destroy( &priv->msg_bank.lock);
if( psz_str == NULL )
{
+ int canc = vlc_savecancel (); /* Do not print half of a message... */
#ifdef __GLIBC__
fprintf( stderr, "main warning: can't store message (%m): " );
#else
vfprintf( stderr, psz_format, args );
va_end( args );
fputs( "\n", stderr );
+ vlc_restorecancel (canc);
return;
}
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_id = (uintptr_t)p_this;
p_item->psz_object_type = p_this->psz_object_type;
p_item->psz_module = strdup( "message" );
p_item->psz_msg = strdup( "message queue overflowed" );
/* Fill message information fields */
p_item->i_type = i_type;
- p_item->i_object_id = p_this->i_object_id;
+ p_item->i_object_id = (uintptr_t)p_this;
p_item->psz_object_type = p_this->psz_object_type;
p_item->psz_module = strdup( psz_module );
p_item->psz_msg = psz_str;
#ifdef UNDER_CE
int i_dummy;
#endif
- static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
- static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
+ static const char ppsz_type[4][9] = { "", " error", " warning", " debug" };
+ static const char ppsz_color[4][8] = { WHITE, RED, YELLOW, GRAY };
const char *psz_object;
libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
int i_type = p_item->i_type;
}
psz_object = p_item->psz_object_type;
+ void * val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects,
+ p_item->psz_module );
+ if( val == kObjectPrintingDisabled )
+ return;
+ if( val == kObjectPrintingEnabled )
+ /* Allowed */;
+ else
+ {
+ val = vlc_dictionary_value_for_key( &priv->msg_enabled_objects,
+ psz_object );
+ if( val == kObjectPrintingDisabled )
+ return;
+ if( val == kObjectPrintingEnabled )
+ /* Allowed */;
+ else if( !priv->msg_all_objects_enabled )
+ return;
+ }
+ int canc = vlc_savecancel ();
#ifdef UNDER_CE
# define CE_WRITE(str) WriteFile( QUEUE.logfile, \
str, strlen(str), &i_dummy, NULL );
#else
/* Send the message to stderr */
- if( priv->b_color )
- {
- 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
- {
- 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 );
- }
- }
+ utf8_fprintf( stderr, "[%s%p%s] %s%s%s %s%s: %s%s%s\n",
+ priv->b_color ? GREEN : "",
+ (void *)p_item->i_object_id,
+ priv->b_color ? GRAY : "",
+ p_item->psz_header ? p_item->psz_header : "",
+ p_item->psz_header ? " " : "",
+ p_item->psz_module, psz_object,
+ ppsz_type[i_type],
+ priv->b_color ? ppsz_color[i_type] : "",
+ p_item->psz_msg,
+ priv->b_color ? GRAY : "" );
# if defined(WIN32)
fflush( stderr );
# endif
+ vlc_restorecancel (canc);
#endif
}
static msg_context_t* GetContext(void)
{
- msg_context_t *p_ctx = vlc_threadvar_get( &msg_context_global_key );
+ msg_context_t *p_ctx = vlc_threadvar_get( &msg_context );
if( p_ctx == NULL )
{
MALLOC_NULL( p_ctx, msg_context_t );
p_ctx->psz_message = NULL;
- vlc_threadvar_set( &msg_context_global_key, p_ctx );
+ vlc_threadvar_set( &msg_context, p_ctx );
}
return p_ctx;
}
+void msg_StackDestroy (void *data)
+{
+ msg_context_t *p_ctx = data;
+
+ free (p_ctx->psz_message);
+ free (p_ctx);
+}
+
void msg_StackSet( int i_code, const char *psz_message, ... )
{
va_list ap;
if( p_ctx == NULL )
return;
-
- va_start( ap, psz_message );
free( p_ctx->psz_message );
+ va_start( ap, psz_message );
if( vasprintf( &p_ctx->psz_message, psz_message, ap ) == -1 )
p_ctx->psz_message = NULL;
va_end( ap );
p_ctx->psz_message = psz_tmp;
else
{
- char *psz_old = malloc( strlen( p_ctx->psz_message ) + 1 );
- memcpy( psz_old, p_ctx->psz_message, strlen( p_ctx->psz_message ) + 1 );
- p_ctx->psz_message = realloc( p_ctx->psz_message,
- strlen( p_ctx->psz_message ) +
- /* ':', ' ', '0' */
- strlen( psz_tmp ) + 3 );
- sprintf( p_ctx->psz_message, "%s: %s", psz_tmp, psz_old );
- free( psz_tmp ); free( psz_old );
+ char *psz_new;
+ if( asprintf( &psz_new, "%s: %s", psz_tmp, p_ctx->psz_message ) == -1 )
+ psz_new = NULL;
+
+ free( p_ctx->psz_message );
+ p_ctx->psz_message = psz_new;
+ free( psz_tmp );
}
}
projects / vlc / blobdiff