projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Moved bg_colour_state into ViewItemPaintParams
[pulseview.git]
/
pv
/
data
/
segment.cpp
diff --git
a/pv/data/segment.cpp
b/pv/data/segment.cpp
index 88015c3639860597accf8bf23eb21ed98d499e53..433e7536bbf9cd973c3a2a5af4fec2666d12de1c 100644
(file)
--- a/
pv/data/segment.cpp
+++ b/
pv/data/segment.cpp
@@
-31,7
+31,7
@@
using std::recursive_mutex;
namespace pv {
namespace data {
namespace pv {
namespace data {
-const uint64_t Segment::MaxChunkSize = 10
*1024*
1024; /* 10MiB */
+const uint64_t Segment::MaxChunkSize = 10
* 1024 *
1024; /* 10MiB */
Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
sample_count_(0),
Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
sample_count_(0),
@@
-219,8
+219,6
@@
SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
{
void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
{
- lock_guard<recursive_mutex> lock(mutex_);
-
// Fail gracefully if we are asked to deliver data we don't have
if (it->sample_index > sample_count_)
return;
// Fail gracefully if we are asked to deliver data we don't have
if (it->sample_index > sample_count_)
return;