# define vlc_va_copy(dest,src) (dest)=(src)
#endif
-#define QUEUE priv->msg_bank.queue
-#define LOCK_BANK vlc_mutex_lock( &priv->msg_bank.lock );
-#define UNLOCK_BANK vlc_mutex_unlock( &priv->msg_bank.lock );
+#define QUEUE priv->msg_bank
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void QueueMsg ( vlc_object_t *, int, const char *,
const char *, va_list );
-static void FlushMsg ( msg_queue_t * );
+static void FlushMsg ( msg_bank_t * );
static void PrintMsg ( vlc_object_t *, msg_item_t * );
static vlc_mutex_t msg_stack_lock = VLC_STATIC_MUTEX;
void msg_Create (libvlc_int_t *p_libvlc)
{
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;
/* Destroy lock */
vlc_mutex_destroy( &QUEUE.lock );
- vlc_mutex_destroy( &priv->msg_bank.lock);
}
/**
if (p_sub == NULL)
return NULL;
- LOCK_BANK;
vlc_mutex_lock( &QUEUE.lock );
TAB_APPEND( QUEUE.i_sub, QUEUE.pp_sub, p_sub );
p_sub->p_lock = &QUEUE.lock;
vlc_mutex_unlock( &QUEUE.lock );
- UNLOCK_BANK;
return p_sub;
}
{
libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc);
- LOCK_BANK;
vlc_mutex_lock( &QUEUE.lock );
for( int j = 0 ; j< QUEUE.i_sub ; j++ )
{
}
}
vlc_mutex_unlock( &QUEUE.lock );
- UNLOCK_BANK;
}
/*****************************************************************************
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( vlc_object_t *p_this, const char *psz_format, ... ) \
- { \
- va_list args; \
- va_start( args, psz_format ); \
- QueueMsg( p_this, FN_TYPE, "unknown", psz_format, args ); \
- 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 );
-
/**
* Add a message to a queue
*
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;
+ msg_bank_t *p_queue;
#if !defined(HAVE_VASPRINTF) || defined(__APPLE__) || defined(SYS_BEOS)
int i_size = strlen(psz_format) + INTF_MAX_MSG_SIZE;
psz_str[ i_size - 1 ] = 0; /* Just in case */
#endif
- LOCK_BANK;
p_queue = &QUEUE;
vlc_mutex_lock( &p_queue->lock );
}
vlc_mutex_unlock ( &p_queue->lock );
- UNLOCK_BANK;
}
/* following functions are local */
* Print all messages remaining in queue. MESSAGE QUEUE MUST BE LOCKED, since
* this function does not check the lock.
*****************************************************************************/
-static void FlushMsg ( msg_queue_t *p_queue )
+static void FlushMsg ( msg_bank_t *p_queue )
{
int i_index, i_start, i_stop;