X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=be56c1505263fd44c19901ce8b055112f6888378;hb=69e950969e45ddbf516069c28f72f5696c53af5d;hp=4170f6422d521b0a519432a04b680423844eaf73;hpb=0df28cd5a727c5e4ff2c46e3258b76936bc0c33d;p=pulseview.git

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 4170f642..be56c150 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -63,10 +63,24 @@ LogicSegment::LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
 LogicSegment::~LogicSegment()
 {
 	lock_guard<recursive_mutex> lock(mutex_);
+
 	for (MipMapLevel &l : mip_map_)
 		free(l.data);
 }
 
+shared_ptr<const LogicSegment> LogicSegment::get_shared_ptr() const
+{
+	shared_ptr<const Segment> ptr = nullptr;
+
+	try {
+		ptr = shared_from_this();
+	} catch (std::exception& e) {
+		/* Do nothing, ptr remains a null pointer */
+	}
+
+	return ptr ? std::dynamic_pointer_cast<const LogicSegment>(ptr) : nullptr;
+}
+
 template <class T>
 void LogicSegment::downsampleTmain(const T*&in, T &acc, T &prev)
 {
@@ -328,6 +342,7 @@ void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
 
 void LogicSegment::append_payload(void *data, uint64_t data_size)
 {
+	assert(unit_size_ > 0);
 	assert((data_size % unit_size_) == 0);
 
 	lock_guard<recursive_mutex> lock(mutex_);
@@ -341,15 +356,15 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
 	append_payload_to_mipmap();
 
 	if (sample_count > 1)
-		owner_.notify_samples_added(this, prev_sample_count + 1,
-			prev_sample_count + 1 + sample_count);
+		owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+			prev_sample_count + 1, prev_sample_count + 1 + sample_count);
 	else
-		owner_.notify_samples_added(this, prev_sample_count + 1,
-			prev_sample_count + 1);
+		owner_.notify_samples_added(SharedPtrToSegment(shared_from_this()),
+			prev_sample_count + 1, prev_sample_count + 1);
 }
 
 void LogicSegment::get_samples(int64_t start_sample,
-	int64_t end_sample,	uint8_t* dest) const
+	int64_t end_sample, uint8_t* dest) const
 {
 	assert(start_sample >= 0);
 	assert(start_sample <= (int64_t)sample_count_);