From 30c112c0d2d6fdf0b4d803fc1994aa0dd21dee26 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 27 Oct 2012 11:46:25 +0100 Subject: [PATCH] Misc stuff --- c++/carla-backend/vst.cpp | 2 +- c++/carla-includes/carla_includes.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/c++/carla-backend/vst.cpp b/c++/carla-backend/vst.cpp index e613258..2b71a1e 100644 --- a/c++/carla-backend/vst.cpp +++ b/c++/carla-backend/vst.cpp @@ -1424,7 +1424,7 @@ public: void handleAudioMasterAutomate(const uint32_t index, const double value) { //CARLA_ASSERT(m_enabled); - CARLA_ASSERT(index < param.count); + CARLA_ASSERT_INT(index < param.count, index); if (index >= param.count /*|| ! m_enabled*/) return; diff --git a/c++/carla-includes/carla_includes.h b/c++/carla-includes/carla_includes.h index 1dcb00d..a1865ab 100644 --- a/c++/carla-includes/carla_includes.h +++ b/c++/carla-includes/carla_includes.h @@ -104,8 +104,10 @@ #ifdef NDEBUG # define CARLA_ASSERT(cond) ((!(cond)) ? carla_assert(#cond, __FILE__, __LINE__) : pass()) +# define CARLA_ASSERT_INT(cond, value) ((!(cond)) ? carla_assert_int(#cond, __FILE__, __LINE__, value) : pass()) #else # define CARLA_ASSERT Q_ASSERT +# define CARLA_ASSERT_INT(cond, value) Q_ASSERT(cond) #endif // carla_setprocname @@ -130,6 +132,12 @@ void carla_assert(const char* const assertion, const char* const file, const int qCritical("Carla assertion failure: \"%s\" in file %s, line %i", assertion, file, line); } +static inline +void carla_assert_int(const char* const assertion, const char* const file, const int line, const int value) +{ + qCritical("Carla assertion failure: \"%s\" in file %s, line %i, value %i", assertion, file, line, value); +} + static inline const char* bool2str(const bool yesNo) {