X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=ef1159ee599f8abfbf0a7e6b90d6c100eeef3f44;hp=07405fe4ba79de4a0003c9d08070ed47406c23a0;hb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;hpb=2220e94218298b208041c5e828595d9e1b842c88

diff --git a/pv/session.cpp b/pv/session.cpp
index 07405fe4..ef1159ee 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -324,9 +324,14 @@ void Session::remove_decode_signal(view::DecodeTrace *signal)
 
 void Session::set_capture_state(capture_state state)
 {
-	lock_guard<mutex> lock(sampling_mutex_);
-	const bool changed = capture_state_ != state;
-	capture_state_ = state;
+	bool changed;
+
+	{
+		lock_guard<mutex> lock(sampling_mutex_);
+		changed = capture_state_ != state;
+		capture_state_ = state;
+	}
+
 	if (changed)
 		capture_state_changed(state);
 }
@@ -481,6 +486,11 @@ void Session::feed_in_meta(shared_ptr<Meta> meta)
 	for (auto entry : meta->config()) {
 		switch (entry.first->id()) {
 		case SR_CONF_SAMPLERATE:
+			// We can't rely on the header to always contain the sample rate,
+			// so in case it's supplied via a meta packet, we use it.
+			if (!cur_samplerate_)
+				cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
+
 			/// @todo handle samplerate changes
 			break;
 		default:
@@ -492,6 +502,27 @@ void Session::feed_in_meta(shared_ptr<Meta> meta)
 	signals_changed();
 }
 
+void Session::feed_in_trigger()
+{
+	// The channel containing most samples should be most accurate
+	uint64_t sample_count = 0;
+
+	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
+		assert(d);
+		uint64_t temp_count = 0;
+
+		const vector< shared_ptr<pv::data::Segment> > segments =
+			d->segments();
+		for (const shared_ptr<pv::data::Segment> &s : segments)
+			temp_count += s->get_sample_count();
+
+		if (temp_count > sample_count)
+			sample_count = temp_count;
+	}
+
+	trigger_event(sample_count / get_samplerate());
+}
+
 void Session::feed_in_frame_begin()
 {
 	if (cur_logic_segment_ || !cur_analog_segments_.empty())
@@ -616,6 +647,10 @@ void Session::data_feed_in(shared_ptr<sigrok::Device> device,
 		feed_in_meta(dynamic_pointer_cast<Meta>(packet->payload()));
 		break;
 
+	case SR_DF_TRIGGER:
+		feed_in_trigger();
+		break;
+
 	case SR_DF_FRAME_BEGIN:
 		feed_in_frame_begin();
 		break;