X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=07ee594d7c1ca0390e5af1cef6ca6d24c2f4b22e;hb=b5940cf0ef30b3519389da8c8768aee4d4424415;hp=4dcc2e8b7b77f5da1cfce26781e694d16f23eb7f;hpb=b4d448004ab0899f231b26325e646499d5874144;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index 4dcc2e8..07ee594 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -677,6 +677,17 @@ double Session::get_samplerate() const
 	return samplerate;
 }
 
+int Session::get_segment_count() const
+{
+	int min_val = INT_MAX;
+
+	for (shared_ptr<data::SignalData> data : all_signal_data_)
+		if (data->get_segment_count() < min_val)
+			min_val = data->get_segment_count();
+
+	return min_val;
+}
+
 const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
 {
 	return signalbases_;
@@ -941,7 +952,7 @@ void Session::free_unused_memory()
 
 void Session::feed_in_header()
 {
-	cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+	// Nothing to do here for now
 }
 
 void Session::feed_in_meta(shared_ptr<Meta> meta)
@@ -990,12 +1001,31 @@ 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)
 {
+	if (!cur_samplerate_)
+		cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
 	if (!logic_data_) {
@@ -1028,6 +1058,9 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 void Session::feed_in_analog(shared_ptr<Analog> analog)
 {
+	if (!cur_samplerate_)
+		cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+
 	lock_guard<recursive_mutex> lock(data_mutex_);
 
 	const vector<shared_ptr<Channel>> channels = analog->channels();
@@ -1090,8 +1123,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 +1142,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 +1160,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;
 	}