X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=ad4c17e246f0609079e470750c9c3f979d3f20cd;hp=4dcc2e8b7b77f5da1cfce26781e694d16f23eb7f;hb=837bb15a1c1b668640da474522f174da462d6d61;hpb=2601ce965fc455d23f5a964b84ddd74eb93705c4

diff --git a/pv/session.cpp b/pv/session.cpp
index 4dcc2e8b..ad4c17e2 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -990,10 +990,26 @@ void Session::feed_in_trigger()
 
 void Session::feed_in_frame_begin()
 {
+	frame_began_ = true;
+
 	if (cur_logic_segment_ || !cur_analog_segments_.empty())
 		frame_began();
 }
 
+void Session::feed_in_frame_end()
+{
+	{
+		lock_guard<recursive_mutex> lock(data_mutex_);
+		cur_logic_segment_.reset();
+		cur_analog_segments_.clear();
+	}
+
+	if (frame_began_) {
+		frame_began_ = false;
+		frame_ended();
+	}
+}
+
 void Session::feed_in_logic(shared_ptr<Logic> logic)
 {
 	lock_guard<recursive_mutex> lock(data_mutex_);
@@ -1090,8 +1106,6 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 	shared_ptr<Packet> packet)
 {
-	static bool frame_began = false;
-
 	(void)device;
 
 	assert(device);
@@ -1111,11 +1125,6 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 		feed_in_trigger();
 		break;
 
-	case SR_DF_FRAME_BEGIN:
-		feed_in_frame_begin();
-		frame_began = true;
-		break;
-
 	case SR_DF_LOGIC:
 		try {
 			feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
@@ -1134,20 +1143,25 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 		}
 		break;
 
+	case SR_DF_FRAME_BEGIN:
+		feed_in_frame_begin();
+		break;
+
 	case SR_DF_FRAME_END:
+		feed_in_frame_end();
+		break;
+
 	case SR_DF_END:
-	{
+		// Strictly speaking, this is performed when a frame end marker was
+		// received, so there's no point doing this again. However, not all
+		// devices use frames, and for those devices, we need to do it here.
 		{
 			lock_guard<recursive_mutex> lock(data_mutex_);
 			cur_logic_segment_.reset();
 			cur_analog_segments_.clear();
 		}
-		if (frame_began) {
-			frame_began = false;
-			frame_ended();
-		}
 		break;
-	}
+
 	default:
 		break;
 	}