瀏覽代碼

sokol_audio.h, sokol_spine.h: remove loglevel enum

Andre Weissflog 2 年之前
父節點
當前提交
7d3f94cac2
共有 2 個文件被更改,包括 12 次插入33 次删除
  1. 6 20
      sokol_audio.h
  2. 6 13
      util/sokol_spine.h

+ 6 - 20
sokol_audio.h

@@ -545,20 +545,6 @@ typedef enum saudio_log_item {
 } saudio_log_item;
 } saudio_log_item;
 #undef _SAUDIO_XMACRO
 #undef _SAUDIO_XMACRO
 
 
-/*
-    saudio_loglevel
-
-    Used as parameter in the logging callback. Note that
-    loglevel PANIC is expected to terminate the application
-    because execution cannot continue.
-*/
-typedef enum saudio_loglevel {
-    SAUDIO_LOGLEVEL_PANIC = 0,
-    SAUDIO_LOGLEVEL_ERROR = 1,
-    SAUDIO_LOGLEVEL_WARN = 2,
-    SAUDIO_LOGLEVEL_INFO = 3,
-} saudio_loglevel;
-
 /*
 /*
     saudio_logger
     saudio_logger
 
 
@@ -1116,12 +1102,12 @@ static const char* _saudio_log_messages[] = {
 #undef _SSPINE_XMACRO
 #undef _SSPINE_XMACRO
 #endif // SOKOL_DEBUG
 #endif // SOKOL_DEBUG
 
 
-#define _SAUDIO_PANIC(code) _saudio_log(SAUDIO_LOGITEM_ ##code, SAUDIO_LOGLEVEL_PANIC, __LINE__)
-#define _SAUDIO_ERROR(code) _saudio_log(SAUDIO_LOGITEM_ ##code, SAUDIO_LOGLEVEL_ERROR, __LINE__)
-#define _SAUDIO_WARN(code) _saudio_log(SAUDIO_LOGITEM_ ##code, SAUDIO_LOGLEVEL_WARN, __LINE__)
-#define _SAUDIO_INFO(code) _saudio_log(SAUDIO_LOGITEM_ ##code, SAUDIO_LOGLEVEL_INFO, __LINE__)
+#define _SAUDIO_PANIC(code) _saudio_log(SAUDIO_LOGITEM_ ##code, 0, __LINE__)
+#define _SAUDIO_ERROR(code) _saudio_log(SAUDIO_LOGITEM_ ##code, 1, __LINE__)
+#define _SAUDIO_WARN(code) _saudio_log(SAUDIO_LOGITEM_ ##code, 2, __LINE__)
+#define _SAUDIO_INFO(code) _saudio_log(SAUDIO_LOGITEM_ ##code, 3, __LINE__)
 
 
-static void _saudio_log(saudio_log_item log_item, saudio_loglevel log_level, uint32_t line_nr) {
+static void _saudio_log(saudio_log_item log_item, uint32_t log_level, uint32_t line_nr) {
     if (_saudio.desc.logger.func) {
     if (_saudio.desc.logger.func) {
         #if defined(SOKOL_DEBUG)
         #if defined(SOKOL_DEBUG)
             const char* filename = __FILE__;
             const char* filename = __FILE__;
@@ -1134,7 +1120,7 @@ static void _saudio_log(saudio_log_item log_item, saudio_loglevel log_level, uin
     }
     }
     else {
     else {
         // for log level PANIC it would be 'undefined behaviour' to continue
         // for log level PANIC it would be 'undefined behaviour' to continue
-        if (log_level == SAUDIO_LOGLEVEL_PANIC) {
+        if (log_level == 0) {
             abort();
             abort();
         }
         }
     }
     }

+ 6 - 13
util/sokol_spine.h

@@ -1039,13 +1039,6 @@ typedef enum sspine_log_item {
 } sspine_log_item;
 } sspine_log_item;
 #undef _SSPINE_XMACRO
 #undef _SSPINE_XMACRO
 
 
-typedef enum sspine_loglevel {
-    SSPINE_LOGLEVEL_PANIC = 0,
-    SSPINE_LOGLEVEL_ERROR = 1,
-    SSPINE_LOGLEVEL_WARN = 2,
-    SSPINE_LOGLEVEL_INFO = 3,
-} sspine_loglevel;
-
 typedef struct sspine_layer_transform {
 typedef struct sspine_layer_transform {
     sspine_vec2 size;
     sspine_vec2 size;
     sspine_vec2 origin;
     sspine_vec2 origin;
@@ -2807,12 +2800,12 @@ static const char* _sspine_log_messages[] = {
 #undef _SSPINE_XMACRO
 #undef _SSPINE_XMACRO
 #endif // SOKOL_DEBUG
 #endif // SOKOL_DEBUG
 
 
-#define _SSPINE_PANIC(code) _sspine_log(SSPINE_LOGITEM_ ##code, SSPINE_LOGLEVEL_PANIC, __LINE__)
-#define _SSPINE_ERROR(code) _sspine_log(SSPINE_LOGITEM_ ##code, SSPINE_LOGLEVEL_ERROR, __LINE__)
-#define _SSPINE_WARN(code) _sspine_log(SSPINE_LOGITEM_ ##code, SSPINE_LOGLEVEL_WARN, __LINE__)
-#define _SSPINE_INFO(code) _sspine_log(SSPINE_LOGITEM_ ##code, SSPINE_LOGLEVEL_INFO, __LINE__)
+#define _SSPINE_PANIC(code) _sspine_log(SSPINE_LOGITEM_ ##code, 0, __LINE__)
+#define _SSPINE_ERROR(code) _sspine_log(SSPINE_LOGITEM_ ##code, 1, __LINE__)
+#define _SSPINE_WARN(code) _sspine_log(SSPINE_LOGITEM_ ##code, 2, __LINE__)
+#define _SSPINE_INFO(code) _sspine_log(SSPINE_LOGITEM_ ##code, 3, __LINE__)
 
 
-static void _sspine_log(sspine_log_item log_item, sspine_loglevel log_level, uint32_t line_nr) {
+static void _sspine_log(sspine_log_item log_item, uint32_t log_level, uint32_t line_nr) {
     if (_sspine.desc.logger.func) {
     if (_sspine.desc.logger.func) {
         #if defined(SOKOL_DEBUG)
         #if defined(SOKOL_DEBUG)
             const char* filename = __FILE__;
             const char* filename = __FILE__;
@@ -2825,7 +2818,7 @@ static void _sspine_log(sspine_log_item log_item, sspine_loglevel log_level, uin
     }
     }
     else {
     else {
         // for log level PANIC it would be 'undefined behaviour' to continue
         // for log level PANIC it would be 'undefined behaviour' to continue
-        if (log_level == SSPINE_LOGLEVEL_PANIC) {
+        if (log_level == 0) {
             abort();
             abort();
         }
         }
     }
     }