Rework signals for modularity

[pulseview.git] / pv / data / logicsegment.hpp

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 8cbc1c5dc050d7aac6c03625908ce0be337eecf9..1f151eeb7a71e2e0f5e931f6ec0f3a7a08d7e0b4 100644 (file)
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -22,11 +22,11 @@
 
 #include "segment.hpp"
 
-#include <utility>
 #include <vector>
 
 #include <QObject>
 
+using std::enable_shared_from_this;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -48,7 +48,7 @@ namespace data {
 
 class Logic;
 
-class LogicSegment : public Segment
+class LogicSegment : public Segment, public enable_shared_from_this<Segment>
 {
        Q_OBJECT
 
@@ -107,6 +107,10 @@ private:
 
        uint64_t get_unpacked_sample(uint64_t index) const;
 
+       template <class T> void downsampleTmain(const T*&in, T &acc, T &prev);
+       template <class T> void downsampleT(const uint8_t *in, uint8_t *&out, uint64_t len);
+       void downsampleGeneric(const uint8_t *in, uint8_t *&out, uint64_t len);
+
 private:
        uint64_t get_subsample(int level, uint64_t offset) const;
 
@@ -117,6 +121,8 @@ private:
 
        struct MipMapLevel mip_map_[ScaleStepCount];
        uint64_t last_append_sample_;
+       uint64_t last_append_accumulator_;
+       uint64_t last_append_extra_;
 
        friend struct LogicSegmentTest::Pow2;
        friend struct LogicSegmentTest::Basic;