#include <QApplication>
+using std::lock_guard;
+
namespace pv {
Logging logging;
Logging::~Logging()
{
- qInstallMessageHandler(0);
+ qInstallMessageHandler(nullptr);
sr_log_callback_set_default();
#ifdef ENABLE_DECODE
srd_log_callback_set_default();
buffer_.reserve(buffer_size_);
qInstallMessageHandler(log_pv);
- sr_log_callback_set(log_libsigrok, nullptr);
+ sr_log_callback_set(log_sr, nullptr);
#ifdef ENABLE_DECODE
- srd_log_callback_set(log_libsrd, nullptr);
+ srd_log_callback_set(log_srd, nullptr);
#endif
GlobalSettings::add_change_handler(this);
void Logging::set_log_level(int level)
{
sr_log_loglevel_set(level);
+#ifdef ENABLE_DECODE
srd_log_loglevel_set(level);
+#endif
}
QString Logging::get_log() const
void Logging::log(const QString &text, int source)
{
+ lock_guard<mutex> log_lock(log_mutex_);
+
if (buffer_.size() >= buffer_size_)
buffer_.removeFirst();
logging.log(msg, LogSource_pv);
}
-int Logging::log_libsigrok(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_sr(void *cb_data, int loglevel, const char *format, va_list args)
{
(void)cb_data;
(void)loglevel;
}
#ifdef ENABLE_DECODE
-int Logging::log_libsrd(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_srd(void *cb_data, int loglevel, const char *format, va_list args)
{
(void)cb_data;
(void)loglevel;