X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.h;h=a215f92801307879b91402ffadffc9f3e668cc2a;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=0f6f410c962487dd8828bda493e86fe33670e050;hpb=8cb717055ce13a6d6568ff384b3cd3932c41d1b0;p=pulseview.git diff --git a/pv/data/logicsnapshot.h b/pv/data/logicsnapshot.h index 0f6f410..a215f92 100644 --- a/pv/data/logicsnapshot.h +++ b/pv/data/logicsnapshot.h @@ -26,12 +26,16 @@ #include #include +namespace sigrok { + class Logic; +} + namespace LogicSnapshotTest { -class Pow2; -class Basic; -class LargeData; -class Pulses; -class LongPulses; +struct Pow2; +struct Basic; +struct LargeData; +struct Pulses; +struct LongPulses; } namespace pv { @@ -58,12 +62,12 @@ public: typedef std::pair EdgePair; public: - LogicSnapshot(const sr_datafeed_logic &logic, + LogicSnapshot(std::shared_ptr logic, uint64_t expected_num_samples = 0); virtual ~LogicSnapshot(); - void append_payload(const sr_datafeed_logic &logic); + void append_payload(std::shared_ptr logic); void get_samples(uint8_t *const data, int64_t start_sample, int64_t end_sample) const; @@ -102,11 +106,11 @@ private: struct MipMapLevel _mip_map[ScaleStepCount]; uint64_t _last_append_sample; - friend class LogicSnapshotTest::Pow2; - friend class LogicSnapshotTest::Basic; - friend class LogicSnapshotTest::LargeData; - friend class LogicSnapshotTest::Pulses; - friend class LogicSnapshotTest::LongPulses; + friend struct LogicSnapshotTest::Pow2; + friend struct LogicSnapshotTest::Basic; + friend struct LogicSnapshotTest::LargeData; + friend struct LogicSnapshotTest::Pulses; + friend struct LogicSnapshotTest::LongPulses; }; } // namespace data