X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=7545da3c15030a7090974f1ee65ee4f413c2e44a;hp=07405fe4ba79de4a0003c9d08070ed47406c23a0;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=2220e94218298b208041c5e828595d9e1b842c88

diff --git a/pv/session.cpp b/pv/session.cpp
index 07405fe..7545da3 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -253,8 +253,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 	map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
 	shared_ptr<data::DecoderStack> decoder_stack;
 
-	try
-	{
+	try {
 		lock_guard<boost::shared_mutex> lock(signals_mutex_);
 
 		// Create the decoder
@@ -270,8 +269,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 		// Auto select the initial channels
 		for (const srd_channel *pdch : all_channels)
-			for (shared_ptr<view::Signal> s : signals_)
-			{
+			for (shared_ptr<view::Signal> s : signals_) {
 				shared_ptr<view::LogicSignal> l =
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
@@ -290,9 +288,7 @@ bool Session::add_decoder(srd_decoder *const dec)
 			new view::DecodeTrace(*this, decoder_stack,
 				decode_traces_.size()));
 		decode_traces_.push_back(d);
-	}
-	catch(std::runtime_error e)
-	{
+	} catch (std::runtime_error e) {
 		return false;
 	}
 
@@ -313,8 +309,7 @@ vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
 void Session::remove_decode_signal(view::DecodeTrace *signal)
 {
 	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
-		if ((*i).get() == signal)
-		{
+		if ((*i).get() == signal) {
 			decode_traces_.erase(i);
 			signals_changed();
 			return;
@@ -324,9 +319,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);
 }
@@ -449,7 +449,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 
 	try {
 		device_->start();
-	} catch(Error e) {
+	} catch (Error e) {
 		error_handler(e.what());
 		return;
 	}
@@ -461,8 +461,7 @@ void Session::sample_thread_proc(shared_ptr<devices::Device> device,
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received
-	if (cur_logic_segment_)
-	{
+	if (cur_logic_segment_) {
 		qDebug("SR_DF_END was not received.");
 		assert(0);
 	}
@@ -481,6 +480,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 +496,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())
@@ -504,16 +529,14 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 	const size_t sample_count = logic->data_length() / logic->unit_size();
 
-	if (!logic_data_)
-	{
+	if (!logic_data_) {
 		// The only reason logic_data_ would not have been created is
 		// if it was not possible to determine the signals when the
 		// device was created.
 		update_signals();
 	}
 
-	if (!cur_logic_segment_)
-	{
+	if (!cur_logic_segment_) {
 		// This could be the first packet after a trigger
 		set_capture_state(Running);
 
@@ -528,9 +551,7 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 		// frame_began is DecoderStack, but in future we need to signal
 		// this after both analog and logic sweeps have begun.
 		frame_began();
-	}
-	else
-	{
+	} else {
 		// Append to the existing data segment
 		cur_logic_segment_->append_payload(logic);
 	}
@@ -548,8 +569,10 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
-	for (auto channel : channels)
-	{
+	if (signals_.empty())
+		update_signals();
+
+	for (auto channel : channels) {
 		shared_ptr<data::AnalogSegment> segment;
 
 		// Try to get the segment of the channel
@@ -557,8 +580,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 			iterator iter = cur_analog_segments_.find(channel);
 		if (iter != cur_analog_segments_.end())
 			segment = (*iter).second;
-		else
-		{
+		else {
 			// If no segment was found, this means we havn't
 			// created one yet. i.e. this is the first packet
 			// in the sweep containing this segment.
@@ -616,6 +638,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;