diff options
author | bircoph <bircoph@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-28 19:57:56 +0000 |
---|---|---|
committer | bircoph <bircoph@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-28 19:57:56 +0000 |
commit | 42a792bbc71e1cb4b15765af8acda48a9951a210 (patch) | |
tree | 7981ec1d5ac13db260b7bd5d81d1c4848b18a7f1 /libaf/af.h | |
parent | 0a1f688c6e837c6807335d8771d785c1c3ff679b (diff) | |
download | mpv-42a792bbc71e1cb4b15765af8acda48a9951a210.tar.bz2 mpv-42a792bbc71e1cb4b15765af8acda48a9951a210.tar.xz |
Remove af_msg special-casing API in libaf.
Replace it by standard mp_msg message system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29088 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af.h')
-rw-r--r-- | libaf/af.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/libaf/af.h b/libaf/af.h index 71dd023fa5..13f3f6cf76 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -25,6 +25,7 @@ #include "af_mp.h" #include "control.h" #include "af_format.h" +#include "mp_msg.h" struct af_instance_s; @@ -342,34 +343,4 @@ void af_fix_parameters(af_data_t *data); #define lrnd(a,b) ((b)((a)>=0.0?(a)+0.5:(a)-0.5)) #endif -/* Error messages */ - -typedef struct af_msg_cfg_s -{ - int level; /* Message level for debug and error messages max = 2 - min = -2 default = 0 */ - FILE* err; // Stream to print error messages to - FILE* msg; // Stream to print information messages to -}af_msg_cfg_t; - -extern af_msg_cfg_t af_msg_cfg; // Message - -//! \addtogroup af_filter -//! \{ -#define AF_MSG_FATAL -3 ///< Fatal error exit immediately -#define AF_MSG_ERROR -2 ///< Error return gracefully -#define AF_MSG_WARN -1 ///< Print warning but do not exit (can be suppressed) -#define AF_MSG_INFO 0 ///< Important information -#define AF_MSG_VERBOSE 1 ///< Print this if verbose is enabled -#define AF_MSG_DEBUG0 2 ///< Print if very verbose -#define AF_MSG_DEBUG1 3 ///< Print if very very verbose - -//! Macro for printing error messages -#ifndef af_msg -#define af_msg(lev, args... ) \ -(((lev)<AF_MSG_WARN)?(fprintf(af_msg_cfg.err?af_msg_cfg.err:stderr, ## args )): \ -(((lev)<=af_msg_cfg.level)?(fprintf(af_msg_cfg.msg?af_msg_cfg.msg:stdout, ## args )):0)) -#endif -//! \} - #endif /* MPLAYER_AF_H */ |