X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=a00a22ede0cd33ee5aa3b43042f51b59c37d8376;hp=f1ff3c3c267fbf14a7fa56aba4b6a48843c0b1dd;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hpb=c82c7e4e330ce5aa04c4f3b8e6f8de85e3e288e1

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index f1ff3c3c..a00a22ed 100644
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -28,11 +28,16 @@
 #include "config.h"
 #include "logicsnapshot.h"
 
+#include <libsigrok/libsigrok.hpp>
+
 using std::lock_guard;
 using std::recursive_mutex;
 using std::max;
 using std::min;
 using std::pair;
+using std::shared_ptr;
+
+using sigrok::Logic;
 
 namespace pv {
 namespace data {
@@ -42,9 +47,9 @@ const int LogicSnapshot::MipMapScaleFactor = 1 << MipMapScalePower;
 const float LogicSnapshot::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSnapshot::MipMapDataUnit = 64*1024;	// bytes
 
-LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic,
+LogicSnapshot::LogicSnapshot(shared_ptr<Logic> logic,
                              const uint64_t expected_num_samples) :
-	Snapshot(logic.unitsize),
+	Snapshot(logic->unit_size()),
 	_last_append_sample(0)
 {
 	set_capacity(expected_num_samples);
@@ -135,15 +140,15 @@ void LogicSnapshot::pack_sample(uint8_t *ptr, uint64_t value)
 #endif
 }
 
-void LogicSnapshot::append_payload(
-	const sr_datafeed_logic &logic)
+void LogicSnapshot::append_payload(shared_ptr<Logic> logic)
 {
-	assert(_unit_size == logic.unitsize);
-	assert((logic.length % _unit_size) == 0);
+	assert(_unit_size == logic->unit_size());
+	assert((logic->data_length() % _unit_size) == 0);
 
 	lock_guard<recursive_mutex> lock(_mutex);
 
-	append_data(logic.data, logic.length / _unit_size);
+	append_data(logic->data_pointer(),
+		logic->data_length() / _unit_size);
 
 	// Generate the first mip-map from the data
 	append_payload_to_mipmap();
@@ -263,7 +268,6 @@ void LogicSnapshot::append_payload_to_mipmap()
 
 uint64_t LogicSnapshot::get_sample(uint64_t index) const
 {
-	assert(_data);
 	assert(index < _sample_count);
 
 	return unpack_sample((uint8_t*)_data.data() + index * _unit_size);