From 9c11267166672b9ef174ca9313c02987364f68aa Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Thu, 13 Dec 2012 22:40:22 +0000
Subject: [PATCH] Factored out feed_in_logic

---
 pv/sigsession.cpp | 40 +++++++++++++++++++++-------------------
 pv/sigsession.h   |  2 ++
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 3566807e..b9ccc2b6 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -206,6 +206,26 @@ void SigSession::feed_in_meta_logic(const struct sr_dev_inst *sdi,
 	}
 }
 
+void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
+{
+	lock_guard<mutex> lock(_data_mutex);
+	if (!_cur_logic_snapshot)
+	{
+		// Create a new data snapshot
+		_cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
+			new LogicDataSnapshot(logic));
+		_logic_data->push_snapshot(_cur_logic_snapshot);
+	}
+	else
+	{
+		// Append to the existing data snapshot
+		_cur_logic_snapshot->append_payload(logic);
+	}
+
+	data_updated();
+}
+
+
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 	const struct sr_datafeed_packet *packet)
 {
@@ -227,27 +247,9 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 		break;
 
 	case SR_DF_LOGIC:
-	{
-		lock_guard<mutex> lock(_data_mutex);
 		assert(packet->payload);
-		if (!_cur_logic_snapshot)
-		{
-			// Create a new data snapshot
-			_cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
-				new LogicDataSnapshot(
-				*(sr_datafeed_logic*)packet->payload));
-			_logic_data->push_snapshot(_cur_logic_snapshot);
-		}
-		else
-		{
-			// Append to the existing data snapshot
-			_cur_logic_snapshot->append_payload(
-				*(sr_datafeed_logic*)packet->payload);
-		}
-
-		data_updated();
+		feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
 		break;
-	}
 
 	case SR_DF_END:
 	{
diff --git a/pv/sigsession.h b/pv/sigsession.h
index 15e247b5..42cac0f6 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -84,6 +84,8 @@ private:
 	void feed_in_meta_logic(const struct sr_dev_inst *sdi,
 		const sr_datafeed_meta_logic &meta_logic);
 
+	void feed_in_logic(const sr_datafeed_logic &logic);
+
 	void data_feed_in(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
 
-- 
2.30.2