projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning for unused Session::sample_thread_proc() parameter
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 6b7645bc7c7ef92e876e74076e062f7f532171c0..73dd339b60fea95259d6fddc7aace7ec9f3ad0e1 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-195,10
+195,14
@@
Session::capture_state Session::get_capture_state() const
void Session::start_capture(function<void (const QString)> error_handler)
{
void Session::start_capture(function<void (const QString)> error_handler)
{
+ if (!device_) {
+ error_handler(tr("No active device set, can't start acquisition."));
+ return;
+ }
+
stop_capture();
// Check that at least one channel is enabled
stop_capture();
// Check that at least one channel is enabled
- assert(device_);
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
@@
-219,8
+223,7
@@
void Session::start_capture(function<void (const QString)> error_handler)
// Begin the session
sampling_thread_ = std::thread(
// 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()
}
void Session::stop_capture()
@@
-454,13
+457,12
@@
shared_ptr<view::Signal> Session::signal_from_channel(
return shared_ptr<view::Signal>();
}
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);
assert(error_handler);
- (void)device;
+ if (!device_)
+ return;
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);