projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use obsolete channel-based triggers.
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 6948ced138a43dcc6e0792b0d5c13f9a0eaf205f..87b561eb11ccc8a09aea5db2b1f2f652810a5344 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-39,24
+39,22
@@
#include "view/decodetrace.h"
#include "view/logicsignal.h"
#include "view/decodetrace.h"
#include "view/logicsignal.h"
-#include <
assert.h
>
-
+#include <
cassert
>
+#include <mutex>
#include <stdexcept>
#include <stdexcept>
-#include <boost/foreach.hpp>
-
#include <sys/stat.h>
#include <QDebug>
#include <sys/stat.h>
#include <QDebug>
-using boost::dynamic_pointer_cast;
-using boost::function;
-using boost::lock_guard;
-using boost::mutex;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::function;
+using std::lock_guard;
+using std::mutex;
using std::list;
using std::map;
using std::set;
using std::list;
using std::map;
using std::set;
+using std::shared_ptr;
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-137,7
+135,7
@@
void SigSession::set_default_device()
default_device = devices.front();
// Try and find the demo device and select that by default
default_device = devices.front();
// Try and find the demo device and select that by default
-
BOOST_FOREACH (shared_ptr<pv::device::Device> dev,
devices)
+
for (shared_ptr<pv::device::Device> dev :
devices)
if (strcmp(dev->dev_inst()->driver->name,
"demo") == 0) {
default_device = dev;
if (strcmp(dev->dev_inst()->driver->name,
"demo") == 0) {
default_device = dev;
@@
-190,7
+188,7
@@
void SigSession::start_capture(function<void (const QString)> error_handler)
}
// Begin the session
}
// Begin the session
- _sampling_thread =
boost
::thread(
+ _sampling_thread =
std
::thread(
&SigSession::sample_thread_proc, this, _dev_inst,
error_handler);
}
&SigSession::sample_thread_proc, this, _dev_inst,
error_handler);
}
@@
-211,7
+209,7
@@
set< shared_ptr<data::SignalData> > SigSession::get_data() const
{
lock_guard<mutex> lock(_signals_mutex);
set< shared_ptr<data::SignalData> > data;
{
lock_guard<mutex> lock(_signals_mutex);
set< shared_ptr<data::SignalData> > data;
-
BOOST_FOREACH(const shared_ptr<view::Signal> sig,
_signals) {
+
for (const shared_ptr<view::Signal> sig :
_signals) {
assert(sig);
data.insert(sig->data());
}
assert(sig);
data.insert(sig->data());
}
@@
-247,8
+245,8
@@
bool SigSession::add_decoder(srd_decoder *const dec)
all_probes.push_back((const srd_channel*)i->data);
// Auto select the initial probes
all_probes.push_back((const srd_channel*)i->data);
// Auto select the initial probes
-
BOOST_FOREACH(const srd_channel *pdch,
all_probes)
-
BOOST_FOREACH(shared_ptr<view::Signal> s,
_signals)
+
for (const srd_channel *pdch :
all_probes)
+
for (shared_ptr<view::Signal> s :
_signals)
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
@@
-399,7
+397,7
@@
shared_ptr<view::Signal> SigSession::signal_from_probe(
const sr_channel *probe) const
{
lock_guard<mutex> lock(_signals_mutex);
const sr_channel *probe) const
{
lock_guard<mutex> lock(_signals_mutex);
-
BOOST_FOREACH(shared_ptr<view::Signal> sig,
_signals) {
+
for (shared_ptr<view::Signal> sig :
_signals) {
assert(sig);
if (sig->probe() == probe)
return sig;
assert(sig);
if (sig->probe() == probe)
return sig;
@@
-428,7
+426,7
@@
void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
// Set the sample rate of all data
const set< shared_ptr<data::SignalData> > data_set = get_data();
// Set the sample rate of all data
const set< shared_ptr<data::SignalData> > data_set = get_data();
-
BOOST_FOREACH(shared_ptr<data::SignalData> data,
data_set) {
+
for (shared_ptr<data::SignalData> data :
data_set) {
assert(data);
data->set_samplerate(sample_rate);
}
assert(data);
data->set_samplerate(sample_rate);
}
@@
-450,7
+448,7
@@
void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
return;
}
return;
}
- set_capture_state(
dev_inst->is_trigger_enabled
() ?
+ set_capture_state(
sr_session_trigger_get
() ?
AwaitingTrigger : Running);
dev_inst->run();
AwaitingTrigger : Running);
dev_inst->run();