diff options
| -rw-r--r-- | tracker-trackhat/camera.cpp | 9 | ||||
| -rw-r--r-- | tracker-trackhat/trackhat.hpp | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tracker-trackhat/camera.cpp b/tracker-trackhat/camera.cpp index 35384b80..b645f3af 100644 --- a/tracker-trackhat/camera.cpp +++ b/tracker-trackhat/camera.cpp @@ -4,13 +4,16 @@ namespace trackhat_impl { -TH_ErrorCode log_error(TH_ErrorCode error, const char* source) +TH_ErrorCode log_error(TH_ErrorCode error, const char* source, + const char* file, int line, const char* function) { if (error == TH_ERROR_DEVICE_ALREADY_OPEN) error = TH_SUCCESS; if (error) - fprintf(stderr, "error 0x%x in %s\n", -error, source); - fflush(stderr); + { + auto logger = QMessageLogger(file, line, function).warning(); + logger << "tracker/trackhat: error" << (void*)-error << "in" << source; + } return error; } diff --git a/tracker-trackhat/trackhat.hpp b/tracker-trackhat/trackhat.hpp index 4725e12d..7dce6d76 100644 --- a/tracker-trackhat/trackhat.hpp +++ b/tracker-trackhat/trackhat.hpp @@ -24,8 +24,9 @@ namespace trackhat_impl { using namespace options; -TH_ErrorCode log_error(TH_ErrorCode error, const char* source); -#define th_check(expr) ::trackhat_impl::log_error((expr), #expr) +TH_ErrorCode log_error(TH_ErrorCode error, const char* source, const char* file, int line, const char* function); +#define th_check_(expr, expr2) ::trackhat_impl::log_error((expr), expr2) +#define th_check(expr) ::trackhat_impl::log_error((expr), #expr, __FILE__, __LINE__, function_name) struct trackhat_settings : opts { |