Revise CAudioError to derive std::exception

[platform/core/api/audio-io.git] / include / CAudioIODef.h

diff --git a/include/CAudioIODef.h b/include/CAudioIODef.h
index b7ce786..d400d43 100644 (file)
--- a/include/CAudioIODef.h
+++ b/include/CAudioIODef.h
@@ -76,24 +76,12 @@
 #define COLOR_END
 #endif
 
-
-#define RET_ERROR(_x_)              do {return CAudioError((_x_), __FILE__, __func__, __LINE__);} while(0)
-#define RET_ERROR_MSG(_x_, _msg_)   do {return CAudioError((_x_), (_msg_), __FILE__, __func__, __LINE__);} while(0)
-
-#define RET_ERROR_MSG_FORMAT(_x_, _format_, ...) do {                     \
-    char _msg_[CAudioError::MSG_LENGTH] = {0, };                       \
-    snprintf(_msg_, CAudioError::MSG_LENGTH, _format_, ##__VA_ARGS__); \
-    return CAudioError((_x_), (_msg_), __FILE__, __func__, __LINE__);  \
-} while (0)
-
-
-#define THROW_ERROR(_x_)            do {throw  CAudioError((_x_), __FILE__, __func__, __LINE__);} while (0)
-#define THROW_ERROR_MSG(_x_, _msg_) do {throw  CAudioError((_x_), (_msg_), __FILE__, __func__, __LINE__);} while (0)
+#define THROW_ERROR_MSG(_x_, _msg_) do {throw  CAudioError((_x_), (_msg_), __BASE_FILE__, __func__, __LINE__);} while (0)
 
 #define THROW_ERROR_MSG_FORMAT(_x_, _format_, ...) do {                   \
     char _msg_[CAudioError::MSG_LENGTH] = {0, };                       \
     snprintf(_msg_, CAudioError::MSG_LENGTH, _format_, ##__VA_ARGS__); \
-    throw CAudioError((_x_), (_msg_), __FILE__,  __func__, __LINE__);  \
+    throw CAudioError((_x_), (_msg_), __BASE_FILE__,  __func__, __LINE__);  \
 } while (0)
 
 #define VALID_POINTER_START(_x_) { \
@@ -103,7 +91,6 @@
 
 #define SAFE_DELETE(_x_)   do {if ((_x_)) {delete (_x_); (_x_) = NULL;}} while (0)
 #define SAFE_FINALIZE(_x_) do {if ((_x_)) {(_x_)->finalize();}} while (0)
-#define SAFE_REMOVE(_x_)   do {if ((_x_)) {(_x_)->finalize(); delete (_x_); (_x_) = NULL;}} while (0)
 
 #define DEFAULT_PERIOD_SIZE 50