#include <stdarg.h> /* va_list for BSD */
#ifdef __APPLE__
-#include <xlocale.h>
-#else
-#include <locale.h>
+# include <xlocale.h>
+#elif defined(HAVE_LOCALE_H)
+# include <locale.h>
#endif
#include <errno.h> /* errno */
static void const * kObjectPrintingEnabled = &kObjectPrintingEnabled;
static void const * kObjectPrintingDisabled = &kObjectPrintingDisabled;
+
#undef msg_EnableObjectPrinting
void msg_EnableObjectPrinting (vlc_object_t *obj, const char * psz_object)
{
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
*****************************************************************************
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"
static const char ppsz_type[4][9] = { "", " error", " warning", " debug" };
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;