X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_messages.h;h=1ce7d7b914ac6cac8c52844c11c2923897ff02da;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=6ad4c0a281ff7d15fd99a13fb0390f4d821a5ccd;hpb=fbf4c8060d35617e39b50ae739307152d02ed951;p=vlc diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 6ad4c0a281..1ce7d7b914 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -24,18 +24,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif - #ifndef _VLC_MESSAGES_H_ #define _VLC_MESSAGES_H_ #include -int vlc_mutex_lock( vlc_mutex_t * ) ; -int vlc_mutex_unlock( vlc_mutex_t * ) ; - /** * \defgroup messages Messages * This library provides basic functions for threads to interact with user @@ -44,15 +37,14 @@ int vlc_mutex_unlock( vlc_mutex_t * ) ; * @{ */ - /** - * Store a single message. + * Store a single message sent to user. */ typedef struct { int i_type; /**< message type, see below */ int i_object_id; - int i_object_type; + const char *psz_object_type; char * psz_module; char * psz_msg; /**< the message itself */ char * psz_header; /**< Additional header */ @@ -70,42 +62,6 @@ typedef struct /** debug messages */ #define VLC_MSG_DBG 3 -#define MSG_QUEUE_NORMAL 0 -#define MSG_QUEUE_HTTPD_ACCESS 1 -#define NB_QUEUES 2 - -struct msg_queue_t -{ - int i_id; - - /** Message queue lock */ - vlc_mutex_t lock; - vlc_bool_t b_overflow; - - /* Message queue */ - msg_item_t msg[VLC_MSG_QSIZE]; /**< message queue */ - int i_start; - int i_stop; - - /* Subscribers */ - int i_sub; - msg_subscription_t **pp_sub; - - /* Logfile for WinCE */ -#ifdef UNDER_CE - FILE *logfile; -#endif -}; - -/** - * Store all data requiered by messages interfaces. - */ -struct msg_bank_t -{ - vlc_mutex_t lock; - msg_queue_t queues[NB_QUEUES]; -}; - /** * Used by interface plugins which subscribe to the message bank. */ @@ -121,90 +77,32 @@ struct msg_subscription_t /***************************************************************************** * Prototypes *****************************************************************************/ -VLC_EXPORT( void, __msg_Generic, ( vlc_object_t *, int, int, const char *, const char *, ... ) ATTRIBUTE_FORMAT( 5, 6 ) ); -VLC_EXPORT( void, __msg_GenericVa, ( vlc_object_t *, int, int, const char *, const char *, va_list args ) ); -#define msg_GenericVa(a, b, c, d, e,f) __msg_GenericVa(VLC_OBJECT(a), b, c, d, e,f) -VLC_EXPORT( void, __msg_Info, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); -VLC_EXPORT( void, __msg_Err, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); -VLC_EXPORT( void, __msg_Warn, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); -VLC_EXPORT( void, __msg_Dbg, ( vlc_object_t *, const char *, ... ) ATTRIBUTE_FORMAT( 2, 3 ) ); - -#ifdef HAVE_VARIADIC_MACROS - -# define msg_Info( p_this, psz_format, args... ) \ - __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL,VLC_MSG_INFO, MODULE_STRING, \ - psz_format, ## args ) - -# define msg_Err( p_this, psz_format, args... ) \ - __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_ERR, MODULE_STRING, \ - psz_format, ## args ) - -# define msg_Warn( p_this, psz_format, args... ) \ - __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_WARN, MODULE_STRING, \ - psz_format, ## args ) - -# define msg_Dbg( p_this, psz_format, args... ) \ - __msg_Generic( VLC_OBJECT(p_this), MSG_QUEUE_NORMAL, VLC_MSG_DBG, MODULE_STRING, \ - psz_format, ## args ) - -#elif defined(_MSC_VER) /* To avoid warnings and even errors with c++ files */ - -inline void msg_Info( void *p_this, const char *psz_format, ... ) -{ - va_list ap; - va_start( ap, psz_format ); - __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL,VLC_MSG_INFO, MODULE_STRING, - psz_format, ap ); - va_end(ap); -} -inline void msg_Err( void *p_this, const char *psz_format, ... ) -{ - va_list ap; - va_start( ap, psz_format ); - __msg_GenericVa( ( vlc_object_t *)p_this,MSG_QUEUE_NORMAL, VLC_MSG_ERR, MODULE_STRING, - psz_format, ap ); - va_end(ap); -} -inline void msg_Warn( void *p_this, const char *psz_format, ... ) -{ - va_list ap; - va_start( ap, psz_format ); - __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL, VLC_MSG_WARN, MODULE_STRING, - psz_format, ap ); - va_end(ap); -} -inline void msg_Dbg( void *p_this, const char *psz_format, ... ) -{ - va_list ap; - va_start( ap, psz_format ); - __msg_GenericVa( ( vlc_object_t *)p_this, MSG_QUEUE_NORMAL, VLC_MSG_DBG, MODULE_STRING, - psz_format, ap ); - va_end(ap); -} - -#else /* _MSC_VER */ - -# define msg_Info __msg_Info -# define msg_Err __msg_Err -# define msg_Warn __msg_Warn -# define msg_Dbg __msg_Dbg - -#endif /* HAVE_VARIADIC_MACROS */ - -#define msg_Create(a) __msg_Create(VLC_OBJECT(a)) -#define msg_Flush(a) __msg_Flush(VLC_OBJECT(a)) -#define msg_Destroy(a) __msg_Destroy(VLC_OBJECT(a)) -void __msg_Create ( vlc_object_t * ); -void __msg_Flush ( vlc_object_t * ); -void __msg_Destroy ( vlc_object_t * ); - -#define msg_Subscribe(a,b) __msg_Subscribe(VLC_OBJECT(a),b) +VLC_EXPORT( void, __msg_Generic, ( vlc_object_t *, int, const char *, const char *, ... ) LIBVLC_FORMAT( 4, 5 ) ); +VLC_EXPORT( void, __msg_GenericVa, ( vlc_object_t *, int, const char *, const char *, va_list args ) ); +#define msg_GenericVa(a, b, c, d, e) __msg_GenericVa(VLC_OBJECT(a), b, c, d, e) +VLC_EXPORT( void, __msg_Info, ( vlc_object_t *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) ); +VLC_EXPORT( void, __msg_Err, ( vlc_object_t *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) ); +VLC_EXPORT( void, __msg_Warn, ( vlc_object_t *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) ); +VLC_EXPORT( void, __msg_Dbg, ( vlc_object_t *, const char *, ... ) LIBVLC_FORMAT( 2, 3 ) ); + +#define msg_Info( p_this, ... ) \ + __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_INFO, \ + MODULE_STRING, __VA_ARGS__ ) +#define msg_Err( p_this, ... ) \ + __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_ERR, \ + MODULE_STRING, __VA_ARGS__ ) +#define msg_Warn( p_this, ... ) \ + __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_WARN, \ + MODULE_STRING, __VA_ARGS__ ) +#define msg_Dbg( p_this, ... ) \ + __msg_Generic( VLC_OBJECT(p_this), VLC_MSG_DBG, \ + MODULE_STRING, __VA_ARGS__ ) + +#define msg_Subscribe(a) __msg_Subscribe(VLC_OBJECT(a)) #define msg_Unsubscribe(a,b) __msg_Unsubscribe(VLC_OBJECT(a),b) -VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t *, int ) ); +VLC_EXPORT( msg_subscription_t*, __msg_Subscribe, ( vlc_object_t * ) ); VLC_EXPORT( void, __msg_Unsubscribe, ( vlc_object_t *, msg_subscription_t * ) ); -const char *msg_GetObjectTypeName(int i_object_type ); - /** * @} */ @@ -239,6 +137,7 @@ struct counter_t unsigned int i_id; char * psz_name; int i_type; + void * p_obj; int i_compute_type; int i_samples; counter_sample_t ** pp_samples; @@ -272,6 +171,10 @@ enum STATS_TIMER_ML_DUMP, STATS_TIMER_INTERACTION, STATS_TIMER_PREPARSE, + STATS_TIMER_INPUT_LAUNCHING, + STATS_TIMER_MODULE_NEED, + STATS_TIMER_VIDEO_FRAME_ENCODING, + STATS_TIMER_AUDIO_FRAME_ENCODING, STATS_TIMER_SKINS_PLAYTREE_IMAGE, }; @@ -399,22 +302,18 @@ VLC_EXPORT( void, __stats_ComputeGlobalStats, (vlc_object_t*,global_stats_t*)); /********* * Timing ********/ -#ifdef DEBUG #define stats_TimerStart(a,b,c) __stats_TimerStart( VLC_OBJECT(a), b,c ) #define stats_TimerStop(a,b) __stats_TimerStop( VLC_OBJECT(a), b ) #define stats_TimerDump(a,b) __stats_TimerDump( VLC_OBJECT(a), b ) #define stats_TimersDumpAll(a) __stats_TimersDumpAll( VLC_OBJECT(a) ) -#else -#define stats_TimerStart(a,b,c) {} -#define stats_TimerStop(a,b) {} -#define stats_TimerDump(a,b) {} -#define stats_TimersDumpAll(a) {} -#endif VLC_EXPORT( void,__stats_TimerStart, (vlc_object_t*, const char *, unsigned int ) ); VLC_EXPORT( void,__stats_TimerStop, (vlc_object_t*, unsigned int) ); VLC_EXPORT( void,__stats_TimerDump, (vlc_object_t*, unsigned int) ); VLC_EXPORT( void,__stats_TimersDumpAll, (vlc_object_t*) ); -#define stats_TimersClean(a) __stats_TimersClean( VLC_OBJECT(a) ) -VLC_EXPORT( void, __stats_TimersClean, (vlc_object_t * ) ); +#define stats_TimersCleanAll(a) __stats_TimersCleanAll( VLC_OBJECT(a) ) +VLC_EXPORT( void, __stats_TimersCleanAll, (vlc_object_t * ) ); + +#define stats_TimerClean(a,b) __stats_TimerClean( VLC_OBJECT(a), b ) +VLC_EXPORT( void, __stats_TimerClean, (vlc_object_t *, unsigned int ) ); #endif