#include <vlc_common.h>
#include <stdarg.h> /* va_list for BSD */
-#include <locale.h>
+#ifdef __APPLE__
+# include <xlocale.h>
+#elif defined(HAVE_LOCALE_H)
+# include <locale.h>
+#endif
#include <errno.h> /* errno */
#ifdef WIN32
# define vlc_va_copy(dest,src) (dest)=(src)
#endif
-#define QUEUE priv->msg_bank
static inline msg_bank_t *libvlc_bank (libvlc_int_t *inst)
{
return (libvlc_priv (inst))->msg_bank;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void QueueMsg ( vlc_object_t *, int, const char *,
- const char *, va_list );
static void PrintMsg ( vlc_object_t *, msg_item_t * );
static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
int i_sub;
msg_subscription_t **pp_sub;
- /* Logfile for WinCE */
-#ifdef UNDER_CE
- FILE *logfile;
-#endif
-
locale_t locale; /**< C locale for error messages */
vlc_dictionary_t enabled_objects; ///< Enabled objects
bool all_objects_enabled; ///< Should we print all objects?
/* C locale to get error messages in English in the logs */
bank->locale = newlocale (LC_MESSAGES_MASK, "C", (locale_t)0);
-#ifdef UNDER_CE
- QUEUE.logfile =
- CreateFile( L"vlc-log.txt", GENERIC_WRITE,
- FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
- 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, cleanup_msg_context );
static void const * kObjectPrintingEnabled = &kObjectPrintingEnabled;
static void const * kObjectPrintingDisabled = &kObjectPrintingDisabled;
+
#undef msg_EnableObjectPrinting
void msg_EnableObjectPrinting (vlc_object_t *obj, const char * psz_object)
{
vlc_threadvar_delete( &msg_context );
vlc_mutex_unlock( &msg_stack_lock );
-#ifdef UNDER_CE
- CloseHandle( QUEUE.logfile );
-#endif
if (bank->locale != (locale_t)0)
freelocale (bank->locale);
libvlc_int_t *instance;
msg_callback_t func;
msg_cb_data_t *opaque;
+ int verbosity;
};
/**
sub->instance = instance;
sub->func = cb;
sub->opaque = opaque;
+ sub->verbosity = 2; /* by default, give all the messages */
msg_bank_t *bank = libvlc_bank (instance);
vlc_rwlock_wrlock (&bank->lock);
free (sub);
}
+void msg_SubscriptionSetVerbosity( msg_subscription_t *sub, const int i_verbosity )
+{
+ if( i_verbosity < 0 || i_verbosity > 2 ) return;
+
+ msg_bank_t *bank = libvlc_bank ( sub->instance );
+
+ vlc_rwlock_wrlock (&bank->lock);
+
+ sub->verbosity = i_verbosity;
+
+ vlc_rwlock_unlock (&bank->lock);
+}
/*****************************************************************************
- * __msg_*: print a message
+ * msg_*: print a message
*****************************************************************************
* 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_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 );
+ msg_GenericVa (p_this, i_type, psz_module, psz_format, args);
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 );
-}
-
/**
* Destroys a message.
*/
free (msg);
}
+#undef msg_GenericVa
/**
* Add a message to a queue
*
* 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 )
+void msg_GenericVa (vlc_object_t *p_this, int i_type,
+ const char *psz_module,
+ const char *psz_format, va_list _args)
{
size_t i_header_size; /* Size of the additionnal header */
vlc_object_t *p_obj;
for (int i = 0; i < bank->i_sub; i++)
{
msg_subscription_t *sub = bank->pp_sub[i];
+ libvlc_priv_t *priv = libvlc_priv( sub->instance );
+ msg_bank_t *bank = priv->msg_bank;
+ void *val = vlc_dictionary_value_for_key( &bank->enabled_objects,
+ p_item->psz_module );
+ if( val == kObjectPrintingDisabled ) continue;
+ if( val != kObjectPrintingEnabled ) /*if not allowed */
+ {
+ val = vlc_dictionary_value_for_key( &bank->enabled_objects,
+ p_item->psz_object_type );
+ if( val == kObjectPrintingDisabled ) continue;
+ if( val == kObjectPrintingEnabled ); /* Allowed */
+ else if( !bank->all_objects_enabled ) continue;
+ }
+ switch( p_item->i_type )
+ {
+ case VLC_MSG_INFO:
+ case VLC_MSG_ERR:
+ if( sub->verbosity < 0 ) continue;
+ break;
+ case VLC_MSG_WARN:
+ if( sub->verbosity < 1 ) continue;
+ break;
+ case VLC_MSG_DBG:
+ if( sub->verbosity < 2 ) continue;
+ break;
+ }
+
sub->func (sub->opaque, p_item, 0);
}
vlc_rwlock_unlock (&bank->lock);
*****************************************************************************/
static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
{
-# define COL(x) "\033[" #x ";1m"
-# define RED COL(31)
-# define GREEN COL(32)
-# define YELLOW COL(33)
-# define WHITE COL(0)
+# define COL(x,y) "\033[" #x ";" #y "m"
+# define RED COL(31,1)
+# define GREEN COL(32,1)
+# define YELLOW COL(0,33)
+# define WHITE COL(0,1)
# define GRAY "\033[0m"
-#ifdef UNDER_CE
- int i_dummy;
-#endif
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;
return;
}
-#ifdef UNDER_CE
-# define CE_WRITE(str) WriteFile( QUEUE.logfile, \
- str, strlen(str), &i_dummy, NULL );
- CE_WRITE( p_item->psz_module );
- CE_WRITE( " " );
- CE_WRITE( psz_object );
- CE_WRITE( ppsz_type[i_type] );
- CE_WRITE( ": " );
- CE_WRITE( p_item->psz_msg );
- CE_WRITE( "\r\n" );
- FlushFileBuffers( QUEUE.logfile );
-
-#else
int canc = vlc_savecancel ();
/* Send the message to stderr */
utf8_fprintf( stderr, "[%s%p%s] %s%s%s %s%s: %s%s%s\n",
p_item->psz_msg,
priv->b_color ? GRAY : "" );
-# if defined(WIN32)
+#ifdef WIN32
fflush( stderr );
-# endif
- vlc_restorecancel (canc);
#endif
+ vlc_restorecancel (canc);
}
static msg_context_t* GetContext(void)
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;