From: Joel Holdsworth <redacted>
Date: Fri, 17 Apr 2015 17:23:04 +0000 (+0100)
Subject: Session: Removed device parameter from update_signals
X-Git-Tag: pulseview-0.3.0~207
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ffe001198ecb5ea2e44c2947868c258afe948f20;p=pulseview.git

Session: Removed device parameter from update_signals
---

diff --git a/pv/session.cpp b/pv/session.cpp
index 542b88b7..dd78f4a1 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -133,7 +133,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
 		(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
-	update_signals(device_);
+	update_signals();
 
 	decode_traces_.clear();
 
@@ -301,12 +301,12 @@ void Session::set_capture_state(capture_state state)
 		capture_state_changed(state);
 }
 
-void Session::update_signals(shared_ptr<devices::Device> device)
+void Session::update_signals()
 {
-	assert(device);
+	assert(device_);
 	assert(capture_state_ == Stopped);
 
-	const shared_ptr<sigrok::Device> sr_dev = device->device();
+	const shared_ptr<sigrok::Device> sr_dev = device_->device();
 	if (!sr_dev) {
 		signals_.clear();
 		logic_data_.reset();
@@ -364,7 +364,7 @@ void Session::update_signals(shared_ptr<devices::Device> device)
 				case SR_CHANNEL_LOGIC:
 					signal = shared_ptr<view::Signal>(
 						new view::LogicSignal(*this,
-							device,	channel,
+							device_, channel,
 							logic_data_));
 					break;
 
diff --git a/pv/session.hpp b/pv/session.hpp
index 69099b44..f0b4c162 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -131,7 +131,7 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(std::shared_ptr<devices::Device> device);
+	void update_signals();
 
 	std::shared_ptr<view::Signal> signal_from_channel(
 		std::shared_ptr<sigrok::Channel> channel) const;