diff options
| author | Chris Robinson <[email protected]> | 2012-10-07 04:31:31 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-10-07 04:31:31 -0700 |
| commit | 708f3ccc3d457499ac046a009a7c3317b31a2b4b (patch) | |
| tree | 7feb7d2ae2bb2ae2a5c5b362778f50266d7a25a5 | |
| parent | 84f4afa5f2928a6b2099df71e4e2ead6e48875d0 (diff) | |
Add trace, warn, and error markers to logged output
| -rw-r--r-- | Alc/helpers.c | 6 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Alc/helpers.c b/Alc/helpers.c index 2143a4c8..262c2551 100644 --- a/Alc/helpers.c +++ b/Alc/helpers.c @@ -433,13 +433,13 @@ void *GetSymbol(void *handle, const char *name) #endif -void al_print(const char *func, const char *fmt, ...) +void al_print(const char *type, const char *func, const char *fmt, ...) { char str[256]; int i; - i = snprintf(str, sizeof(str), "AL lib: %s: ", func); - if(i < (int)sizeof(str) && i > 0) + i = snprintf(str, sizeof(str), "AL lib: %s %s: ", type, func); + if(i > 0 && (unsigned int)i < sizeof(str)) { va_list ap; va_start(ap, fmt); diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index ba6a5c8b..0b584fe2 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -826,8 +826,8 @@ ALfloat CalcHrtfDelta(ALfloat oldGain, ALfloat newGain, const ALfloat olddir[3], void GetLerpedHrtfCoeffs(const struct Hrtf *Hrtf, ALfloat elevation, ALfloat azimuth, ALfloat gain, ALfloat (*coeffs)[2], ALuint *delays); ALuint GetMovingHrtfCoeffs(const struct Hrtf *Hrtf, ALfloat elevation, ALfloat azimuth, ALfloat gain, ALfloat delta, ALint counter, ALfloat (*coeffs)[2], ALuint *delays, ALfloat (*coeffStep)[2], ALint *delayStep); -void al_print(const char *func, const char *fmt, ...) PRINTF_STYLE(2,3); -#define AL_PRINT(...) al_print(__FUNCTION__, __VA_ARGS__) +void al_print(const char *type, const char *func, const char *fmt, ...) PRINTF_STYLE(3,4); +#define AL_PRINT(T, ...) al_print((T), __FUNCTION__, __VA_ARGS__) extern FILE *LogFile; enum LogLevel { @@ -841,22 +841,22 @@ extern enum LogLevel LogLevel; #define TRACEREF(...) do { \ if(LogLevel >= LogRef) \ - AL_PRINT(__VA_ARGS__); \ + AL_PRINT("(--)", __VA_ARGS__); \ } while(0) #define TRACE(...) do { \ if(LogLevel >= LogTrace) \ - AL_PRINT(__VA_ARGS__); \ + AL_PRINT("(II)", __VA_ARGS__); \ } while(0) #define WARN(...) do { \ if(LogLevel >= LogWarning) \ - AL_PRINT(__VA_ARGS__); \ + AL_PRINT("(WW)", __VA_ARGS__); \ } while(0) #define ERR(...) do { \ if(LogLevel >= LogError) \ - AL_PRINT(__VA_ARGS__); \ + AL_PRINT("(EE)", __VA_ARGS__); \ } while(0) |