--- a/khronosfws/openmax_al/src/common/xadebug.h Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xadebug.h Mon Oct 04 00:51:56 2010 +0300
@@ -19,6 +19,8 @@
#ifndef XADEBUG_H
#define XADEBUG_H
+#include "xadebugtraceutility.h"
+
#define _DEBUG_API_ 1
#define _DEBUG_ERR_ 2
#define _DEBUG_INFO_ 4
@@ -42,63 +44,92 @@
#ifdef _DEBUG
#include <stdio.h>
#if ( DEBUG_LEVEL & _DEBUG_API_ )
- #define DEBUG_API(X) printf(X"\n");
- #define DEBUG_API_A1(X,A1) printf(X"\n",A1);
- #define DEBUG_API_A2(X,A1,A2) printf(X"\n",A1,A2);
- #define DEBUG_API_A3(X,A1,A2,A3) printf(X"\n",A1,A2,A3);
- #define DEBUG_API_A4(X,A1,A2,A3,A4) printf(X"\n",A1,A2,A3,A4);
- #else // ( DEBUG_LEVEL & _DEBUG_API_ )
+ #define DEBUG_API(X) xa_print(X)
+ #define DEBUG_API_A1(X,A1) xa_print_1(X, A1)
+ #define DEBUG_API_A1_STR(X, A1) xa_print_1_str(X, A1)
+ #define DEBUG_API_A2(X,A1,A2) xa_print_2(X, A1, A2)
+ #define DEBUG_API_A2_STR(X, A1, A2) xa_print_2_str(X, A1, A2)
+ #define DEBUG_API_A3(X,A1,A2,A3) xa_print_3(X, A1, A2, A3)
+ #define DEBUG_API_A4(X,A1,A2,A3,A4) xa_print_4(X, A1, A2, A3, A4)
+
+ #define DEBUG_CPP_API(X) xa_cppprint(X)
+ #define DEBUG_CPP_API_A1(X,A1) xa_cppprint_1(X, A1)
+ #define DEBUG_CPP_API_A2(X,A1,A2) xa_cppprint_2(X, A1, A2)
+
+#else // ( DEBUG_LEVEL & _DEBUG_API_ )
#define DEBUG_API(X);
- #define DEBUG_API_A1(X,A1);
- #define DEBUG_API_A2(X,A1,A2);
- #define DEBUG_API_A3(X,A1,A2,A3);
- #define DEBUG_API_A4(X,A1,A2,A3,A4);
- #endif // ( DEBUG_LEVEL & _DEBUG_API_ )
+ #define DEBUG_API_A1(X,A1)
+ #define DEBUG_API_A1_STR(X, A1)
+ #define DEBUG_API_A2(X,A1,A2)
+ #define DEBUG_API_A2_STR(X, A1, A2)
+ #define DEBUG_API_A3(X,A1,A2,A3)
+ #define DEBUG_API_A4(X,A1,A2,A3,A4)
+
+ #define DEBUG_CPP_API(X)
+ #define DEBUG_CPP_API_A1(X,A1)
+ #define DEBUG_CPP_API_A2(X,A1,A2)
+
+#endif // ( DEBUG_LEVEL & _DEBUG_API_ )
#if ( DEBUG_LEVEL & _DEBUG_ERR_ )
- #define DEBUG_ERR(X) printf(" ERR: "X"\n");
- #define DEBUG_ERR_A1(X,A1) printf(" ERR: "X"\n",A1);
- #define DEBUG_ERR_A2(X,A1,A2) printf(" ERR: "X"\n",A1,A2);
- #define DEBUG_ERR_A3(X,A1,A2,A3) printf(" ERR: "X"\n",A1,A2,A3);
+ #define DEBUG_ERR(X) xa_print(X)
+ #define DEBUG_ERR_A1(X,A1) xa_print_1(X, A1)
+ #define DEBUG_ERR_A1_STR(X,A1) xa_print_1_str(X, A1)
+ #define DEBUG_ERR_A2(X,A1,A2) xa_print_2(X, A1, A2)
+ #define DEBUG_ERR_A3(X,A1,A2,A3) xa_print_3(X, A1, A2, A3)
#else // ( DEBUG_LEVEL & _DEBUG_ERR_ )
- #define DEBUG_ERR(X);
- #define DEBUG_ERR_A1(X,A1);
- #define DEBUG_ERR_A2(X,A1,A2);
- #define DEBUG_ERR_A3(X,A1,A2,A3);
+ #define DEBUG_ERR(X)
+ #define DEBUG_ERR_A1(X,A1)
+ #define DEBUG_ERR_A1_STR(X,A1)
+ #define DEBUG_ERR_A2(X,A1,A2)
+ #define DEBUG_ERR_A3(X,A1,A2,A3)
#endif // ( DEBUG_LEVEL & _DEBUG_ERR_ )
#if ( DEBUG_LEVEL & _DEBUG_INFO_ )
- #define DEBUG_INFO(X) printf(" :"X"\n");
- #define DEBUG_INFO_A1(X,A1) printf(" :"X"\n",A1);
- #define DEBUG_INFO_A2(X,A1,A2) printf(" :"X"\n",A1,A2);
- #define DEBUG_INFO_A3(X,A1,A2,A3) printf(" :"X"\n",A1,A2,A3);
- #define DEBUG_INFO_A4(X,A1,A2,A3,A4) printf(" :"X"\n",A1,A2,A3,A4);
+ #define DEBUG_INFO(X) xa_print(X)
+ #define DEBUG_INFO_A1(X,A1) xa_print_1(X, A1)
+ #define DEBUG_INFO_A1_STR(X, A1) xa_print_1_str(X, A1)
+ #define DEBUG_INFO_A2(X,A1,A2) xa_print_2(X, A1, A2)
+ #define DEBUG_INFO_A2_STR(X, A1, A2) xa_print_2_str(X, A1, A2)
+ #define DEBUG_INFO_A3(X,A1,A2,A3) xa_print_3(X, A1, A2, A3)
+ #define DEBUG_INFO_A4(X,A1,A2,A3,A4) xa_print_4(X, A1, A2, A3, A4)
#else // ( DEBUG_LEVEL & _DEBUG_INFO_ )
#define DEBUG_INFO(X);
- #define DEBUG_INFO_A1(X,A1);
- #define DEBUG_INFO_A2(X,A1,A2);
- #define DEBUG_INFO_A3(X,A1,A2,A3);
- #define DEBUG_INFO_A4(X,A1,A2,A3,A4);
+ #define DEBUG_INFO_A1(X,A1)
+ #define DEBUG_INFO_A1_STR(X, A1)
+ #define DEBUG_INFO_A2(X,A1,A2)
+ #define DEBUG_INFO_A2_STR(X, A1, A2)
+ #define DEBUG_INFO_A3(X,A1,A2,A3)
+ #define DEBUG_INFO_A4(X,A1,A2,A3,A4)
#endif // ( DEBUG_LEVEL & _DEBUG_INFO_ )
#else
#define DEBUG_API(X)
#define DEBUG_API_A1(X,A1)
+ #define DEBUG_API_A1_STR(X, A1)
#define DEBUG_API_A2(X,A1,A2)
+ #define DEBUG_API_A2_STR(X, A1, A2)
#define DEBUG_API_A3(X,A1,A2,A3)
#define DEBUG_API_A4(X,A1,A2,A3,A4)
+ #define DEBUG_CPP_API(X)
+ #define DEBUG_CPP_API_A1(X,A1)
+ #define DEBUG_CPP_API_A2(X,A1,A2)
+
#define DEBUG_ERR(X)
#define DEBUG_ERR_A1(X,A1)
+ #define DEBUG_ERR_A1_STR(X,A1)
#define DEBUG_ERR_A2(X,A1,A2)
#define DEBUG_ERR_A3(X,A1,A2,A3)
#define DEBUG_INFO(X)
#define DEBUG_INFO_A1(X,A1)
+ #define DEBUG_INFO_A1_STR(X, A1)
#define DEBUG_INFO_A2(X,A1,A2)
+ #define DEBUG_INFO_A2_STR(X, A1, A2)
#define DEBUG_INFO_A3(X,A1,A2,A3)
- #define DEBUG_INFO_A4(X,A1,A2,A3,A4);
+ #define DEBUG_INFO_A4(X,A1,A2,A3,A4)
#endif /* _DEBUG */
#endif /* XADEBUG_H */