X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=fcf572297e689f87762eabc81df96207df3000dc;hp=6350682f95ac2a5ae69e8c11e482fc6212914a67;hb=9d22929c3588b994771e8db8f3be5b013fd35040;hpb=6f925ba9d6faf1077b73c5a5808259576081716a diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp index 6350682f..fcf57229 100644 --- a/pv/data/logicsegment.cpp +++ b/pv/data/logicsegment.cpp @@ -58,6 +58,15 @@ LogicSegment::LogicSegment(pv::data::Logic& owner, shared_ptr dat append_payload(data); } +LogicSegment::LogicSegment(pv::data::Logic& owner, unsigned int unit_size, + uint64_t samplerate) : + Segment(samplerate, unit_size), + owner_(owner), + last_append_sample_(0) +{ + memset(mip_map_, 0, sizeof(mip_map_)); +} + LogicSegment::~LogicSegment() { lock_guard lock(mutex_); @@ -144,12 +153,19 @@ void LogicSegment::append_payload(shared_ptr logic) assert(unit_size_ == logic->unit_size()); assert((logic->data_length() % unit_size_) == 0); + append_payload(logic->data_pointer(), logic->data_length()); +} + +void LogicSegment::append_payload(void *data, uint64_t data_size) +{ + assert((data_size % unit_size_) == 0); + lock_guard lock(mutex_); uint64_t prev_sample_count = sample_count_; - uint64_t sample_count = logic->data_length() / unit_size_; + uint64_t sample_count = data_size / unit_size_; - append_samples(logic->data_pointer(), sample_count); + append_samples(data, sample_count); // Generate the first mip-map from the data append_payload_to_mipmap();