#include "view/decodetrace.h"
#include "view/logicsignal.h"
-#include <assert.h>
-
+#include <cassert>
+#include <mutex>
#include <stdexcept>
-#include <boost/foreach.hpp>
-
#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::shared_ptr;
using std::string;
using std::vector;
// TODO: This should not be necessary
SigSession* SigSession::_session = NULL;
+// TODO: This should not be necessary
+struct sr_session *SigSession::_sr_session = NULL;
+
SigSession::SigSession(DeviceManager &device_manager) :
_device_manager(device_manager),
_capture_state(Stopped)
{
using pv::device::Device;
+ // Stop and join to the thread
stop_capture();
- if (_sampling_thread.joinable())
- _sampling_thread.join();
-
_dev_inst->release();
// TODO: This should not be necessary
stop_capture();
if (_dev_inst) {
- sr_session_datafeed_callback_remove_all();
+ sr_session_datafeed_callback_remove_all(_sr_session);
_dev_inst->release();
}
if (dev_inst) {
dev_inst->use(this);
- sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+ sr_session_datafeed_callback_add(_sr_session, data_feed_in_proc, NULL);
update_signals(dev_inst);
}
}
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;
}
// Begin the session
- _sampling_thread = boost::thread(
+ _sampling_thread = std::thread(
&SigSession::sample_thread_proc, this, _dev_inst,
error_handler);
}
void SigSession::stop_capture()
{
- if (get_capture_state() == Stopped)
- return;
-
- sr_session_stop();
+ if (get_capture_state() != Stopped)
+ sr_session_stop(_sr_session);
// Check that sampling stopped
if (_sampling_thread.joinable())
{
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());
}
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);
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;
// 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);
}
return;
}
- set_capture_state(dev_inst->is_trigger_enabled() ?
+ set_capture_state(sr_session_trigger_get(_sr_session) ?
AwaitingTrigger : Running);
dev_inst->run();