projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: add check for explicit linking against libatomic
[pulseview.git]
/
pv
/
data
/
decoderstack.hpp
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index 64ce13b01253398850cfa99a9921074090507980..7be7308bdda98ec8bd68edcb83ec02c44f573012 100644
(file)
--- a/
pv/data/decoderstack.hpp
+++ b/
pv/data/decoderstack.hpp
@@
-79,8
+79,7
@@
private:
static const unsigned int DecodeNotifyPeriod;
public:
static const unsigned int DecodeNotifyPeriod;
public:
- DecoderStack(pv::Session &session_,
- const srd_decoder *const decoder);
+ DecoderStack(pv::Session &session, const srd_decoder *const dec);
virtual ~DecoderStack();
virtual ~DecoderStack();
@@
-140,12
+139,12
@@
private:
double samplerate_;
/**
double samplerate_;
/**
- * This mutex prevents more than one
decode operation occur
ing
- * concurrently.
+ * This mutex prevents more than one
thread from access
ing
+ *
libsigrokdecode
concurrently.
* @todo A proper solution should be implemented to allow multiple
* @todo A proper solution should be implemented to allow multiple
- * decode operations.
+ * decode operations
in parallel
.
*/
*/
- static std::mutex global_
decode
_mutex_;
+ static std::mutex global_
srd
_mutex_;
std::list< std::shared_ptr<decode::Decoder> > stack_;
std::list< std::shared_ptr<decode::Decoder> > stack_;