From: Soeren Apel <redacted>
Date: Sun, 29 May 2016 15:30:49 +0000 (+0200)
Subject: Fix warning for unused Session::sample_thread_proc() parameter
X-Git-Tag: pulseview-0.4.0~290
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa;ds=sidebyside

Fix warning for unused Session::sample_thread_proc() parameter
---

diff --git a/pv/session.cpp b/pv/session.cpp
index ba43ac21..73dd339b 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -223,8 +223,7 @@ void Session::start_capture(function<void (const QString)> error_handler)
 
 	// Begin the session
 	sampling_thread_ = std::thread(
-		&Session::sample_thread_proc, this, device_,
-			error_handler);
+		&Session::sample_thread_proc, this, error_handler);
 }
 
 void Session::stop_capture()
@@ -458,10 +457,8 @@ shared_ptr<view::Signal> Session::signal_from_channel(
 	return shared_ptr<view::Signal>();
 }
 
-void Session::sample_thread_proc(shared_ptr<devices::Device> device,
-	function<void (const QString)> error_handler)
+void Session::sample_thread_proc(function<void (const QString)> error_handler)
 {
-	assert(device);
 	assert(error_handler);
 
 	if (!device_)
diff --git a/pv/session.hpp b/pv/session.hpp
index 22705c36..e113cf4f 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -137,8 +137,7 @@ private:
 		std::shared_ptr<sigrok::Channel> channel) const;
 
 private:
-	void sample_thread_proc(std::shared_ptr<devices::Device> device,
-		std::function<void (const QString)> error_handler);
+	void sample_thread_proc(std::function<void (const QString)> error_handler);
 
 	void feed_in_header();