X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=2a794f0fb0c4af8a79b662e12b810ffdb28b510d;hp=e6fb52fd7dd0d589342ed877ee573cbb572a4755;hb=896936e568346956c32c548c78578e7a0d4094a3;hpb=35750e4dc619d538f105ed024f3a72b630108234

diff --git a/pv/session.cpp b/pv/session.cpp
index e6fb52fd..2a794f0f 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -222,6 +222,25 @@ set< shared_ptr<data::SignalData> > Session::get_data() const
 	return data;
 }
 
+double Session::get_samplerate() const
+{
+	double samplerate = 0.0;
+
+	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
+		assert(d);
+		const vector< shared_ptr<pv::data::Segment> > segments =
+			d->segments();
+		for (const shared_ptr<pv::data::Segment> &s : segments)
+			samplerate = std::max(samplerate, s->samplerate());
+	}
+
+	// If there is no sample rate given we use samples as unit
+	if (samplerate == 0.0)
+		samplerate = 1.0;
+
+	return samplerate;
+}
+
 const unordered_set< shared_ptr<view::Signal> > Session::signals() const
 {
 	shared_lock<shared_mutex> lock(signals_mutex_);
@@ -305,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);
 }
@@ -473,6 +497,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())
@@ -597,6 +642,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;