projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #709 by deriving row/ann colors from the channel color
[pulseview.git]
/
pv
/
logging.cpp
diff --git
a/pv/logging.cpp
b/pv/logging.cpp
index 9740690e7f33e87364a4a915c22499127b3f0cc2..ab0594c342e5b58a0d7bf63ec91693640adbba50 100644
(file)
--- a/
pv/logging.cpp
+++ b/
pv/logging.cpp
@@
-28,6
+28,8
@@
#include <QApplication>
#include <QApplication>
+using std::lock_guard;
+
namespace pv {
Logging logging;
namespace pv {
Logging logging;
@@
-72,7
+74,9
@@
int Logging::get_log_level() const
void Logging::set_log_level(int level)
{
sr_log_loglevel_set(level);
void Logging::set_log_level(int level)
{
sr_log_loglevel_set(level);
+#ifdef ENABLE_DECODE
srd_log_loglevel_set(level);
srd_log_loglevel_set(level);
+#endif
}
QString Logging::get_log() const
}
QString Logging::get_log() const
@@
-82,6
+86,8
@@
QString Logging::get_log() const
void Logging::log(const QString &text, int source)
{
void Logging::log(const QString &text, int source)
{
+ lock_guard<mutex> log_lock(log_mutex_);
+
if (buffer_.size() >= buffer_size_)
buffer_.removeFirst();
if (buffer_.size() >= buffer_size_)
buffer_.removeFirst();