]> sigrok.org Git - pulseview.git/commitdiff
Fix warning for unused Session::sample_thread_proc() parameter
authorSoeren Apel <redacted>
Sun, 29 May 2016 15:30:49 +0000 (17:30 +0200)
committerUwe Hermann <redacted>
Fri, 24 Jun 2016 21:15:39 +0000 (23:15 +0200)
pv/session.cpp
pv/session.hpp

index ba43ac21fb9c64d0d1b2711949fb417e4493c890..73dd339b60fea95259d6fddc7aace7ec9f3ad0e1 100644 (file)
@@ -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_)
index 22705c3670fffdf851f8bdf65e1e115aa82f5b75..e113cf4fdb77711d33a4aac0b45cff49521e88ce 100644 (file)
@@ -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();