X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogging.hpp;h=fe05c5439ecf52d30c663614c08948d1c2b9ef53;hp=699576271a2d68f19f9fe400433a9545bca14295;hb=72486b789078f024e4f3404f81118c03b03e2b70;hpb=bcb4c327ee9b8d2172d126429ba017884d079d4c;ds=sidebyside diff --git a/pv/logging.hpp b/pv/logging.hpp index 69957627..fe05c543 100644 --- a/pv/logging.hpp +++ b/pv/logging.hpp @@ -22,11 +22,15 @@ #include "globalsettings.hpp" +#include + #include #include #include #include +using std::mutex; + namespace pv { class Logging : public QObject, public GlobalSettingsInterface @@ -55,10 +59,10 @@ public: static void log_pv(QtMsgType type, const QMessageLogContext &context, const QString &msg); - static int log_libsigrok(void *cb_data, int loglevel, const char *format, va_list args); + static int log_sr(void *cb_data, int loglevel, const char *format, va_list args); #ifdef ENABLE_DECODE - static int log_libsrd(void *cb_data, int loglevel, const char *format, va_list args); + static int log_srd(void *cb_data, int loglevel, const char *format, va_list args); #endif private: @@ -70,6 +74,7 @@ Q_SIGNALS: private: int buffer_size_; QStringList buffer_; + mutable mutex log_mutex_; }; extern Logging logging;