projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed DecoderStack::_mutex to _output_mutex
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index 716d778b390c1c344e2a829c53498b4d4e5894f8..3bb13284b425503c56786df5337e7c8018dfbb9d 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-106,13
+106,13
@@
void DecoderStack::remove(int index)
int64_t DecoderStack::samples_decoded() const
{
int64_t DecoderStack::samples_decoded() const
{
- lock_guard<mutex> decode_lock(_mutex);
+ lock_guard<mutex> decode_lock(_
output_
mutex);
return _samples_decoded;
}
std::vector<Row> DecoderStack::get_visible_rows() const
{
return _samples_decoded;
}
std::vector<Row> DecoderStack::get_visible_rows() const
{
- lock_guard<mutex> lock(_mutex);
+ lock_guard<mutex> lock(_
output_
mutex);
vector<Row> rows;
vector<Row> rows;
@@
-147,7
+147,7
@@
void DecoderStack::get_annotation_subset(
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
const Row &row, uint64_t start_sample,
uint64_t end_sample) const
{
- lock_guard<mutex> lock(_mutex);
+ lock_guard<mutex> lock(_
output_
mutex);
std::map<const Row, decode::RowData>::const_iterator iter =
_rows.find(row);
std::map<const Row, decode::RowData>::const_iterator iter =
_rows.find(row);
@@
-158,7
+158,7
@@
void DecoderStack::get_annotation_subset(
QString DecoderStack::error_message()
{
QString DecoderStack::error_message()
{
- lock_guard<mutex> lock(_mutex);
+ lock_guard<mutex> lock(_
output_
mutex);
return _error_message;
}
return _error_message;
}
@@
-276,7
+276,7
@@
void DecoderStack::decode_data(
}
{
}
{
- lock_guard<mutex> lock(_mutex);
+ lock_guard<mutex> lock(_
output_
mutex);
_samples_decoded = chunk_end;
}
}
_samples_decoded = chunk_end;
}
}
@@
-349,7
+349,7
@@
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
DecoderStack *const d = (DecoderStack*)decoder;
assert(d);
DecoderStack *const d = (DecoderStack*)decoder;
assert(d);
- lock_guard<mutex> lock(d->_mutex);
+ lock_guard<mutex> lock(d->_
output_
mutex);
const Annotation a(pdata);
const Annotation a(pdata);