#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();
+ if (_dev_inst)
+ _dev_inst->release();
// TODO: This should not be necessary
_session = NULL;
{
using pv::device::Device;
+ if (!dev_inst)
+ return;
+
// Ensure we are not capturing before setting the device
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;
assert(_dev_inst->dev_inst());
- // Check that at least one probe is enabled
+ // Check that at least one channel is enabled
const GSList *l;
for (l = _dev_inst->dev_inst()->channels; l; l = l->next) {
- sr_channel *const probe = (sr_channel*)l->data;
- assert(probe);
- if (probe->enabled)
+ sr_channel *const channel = (sr_channel*)l->data;
+ assert(channel);
+ if (channel->enabled)
break;
}
}
// 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());
}
#ifdef ENABLE_DECODE
bool SigSession::add_decoder(srd_decoder *const dec)
{
- map<const srd_channel*, shared_ptr<view::LogicSignal> > probes;
+ map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
try
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(*this, dec));
- // Make a list of all the probes
- std::vector<const srd_channel*> all_probes;
+ // Make a list of all the channels
+ std::vector<const srd_channel*> all_channels;
for(const GSList *i = dec->channels; i; i = i->next)
- all_probes.push_back((const srd_channel*)i->data);
+ all_channels.push_back((const srd_channel*)i->data);
for(const GSList *i = dec->opt_channels; i; i = i->next)
- all_probes.push_back((const srd_channel*)i->data);
+ all_channels.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)
+ // Auto select the initial channels
+ for (const srd_channel *pdch : all_channels)
+ for (shared_ptr<view::Signal> s : _signals)
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
if (l && QString::fromUtf8(pdch->name).
toLower().contains(
l->get_name().toLower()))
- probes[pdch] = l;
+ channels[pdch] = l;
}
assert(decoder_stack);
assert(!decoder_stack->stack().empty());
assert(decoder_stack->stack().front());
- decoder_stack->stack().front()->set_probes(probes);
+ decoder_stack->stack().front()->set_channels(channels);
// Create the decode signal
shared_ptr<view::DecodeTrace> d(
void SigSession::remove_decode_signal(view::DecodeTrace *signal)
{
- for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
- _decode_traces.begin();
- i != _decode_traces.end();
- i++)
+ for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++)
if ((*i).get() == signal)
{
_decode_traces.erase(i);
assert(dev_inst);
assert(_capture_state == Stopped);
- unsigned int logic_probe_count = 0;
+ unsigned int logic_channel_count = 0;
// Clear the decode traces
_decode_traces.clear();
assert(dev_inst->dev_inst());
for (const GSList *l = dev_inst->dev_inst()->channels;
l; l = l->next) {
- const sr_channel *const probe = (const sr_channel *)l->data;
- if (!probe->enabled)
+ const sr_channel *const channel = (const sr_channel *)l->data;
+ if (!channel->enabled)
continue;
- switch(probe->type) {
+ switch(channel->type) {
case SR_CHANNEL_LOGIC:
- logic_probe_count++;
+ logic_channel_count++;
break;
}
}
lock_guard<mutex> data_lock(_data_mutex);
_logic_data.reset();
- if (logic_probe_count != 0) {
+ if (logic_channel_count != 0) {
_logic_data.reset(new data::Logic(
- logic_probe_count));
+ logic_channel_count));
assert(_logic_data);
}
}
for (const GSList *l = dev_inst->dev_inst()->channels;
l; l = l->next) {
shared_ptr<view::Signal> signal;
- sr_channel *const probe = (sr_channel *)l->data;
- assert(probe);
+ sr_channel *const channel = (sr_channel *)l->data;
+ assert(channel);
- switch(probe->type) {
+ switch(channel->type) {
case SR_CHANNEL_LOGIC:
signal = shared_ptr<view::Signal>(
new view::LogicSignal(dev_inst,
- probe, _logic_data));
+ channel, _logic_data));
break;
case SR_CHANNEL_ANALOG:
new data::Analog());
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(dev_inst,
- probe, data));
+ channel, data));
break;
}
signals_changed();
}
-shared_ptr<view::Signal> SigSession::signal_from_probe(
- const sr_channel *probe) const
+shared_ptr<view::Signal> SigSession::signal_from_channel(
+ const sr_channel *channel) 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)
+ if (sig->channel() == channel)
return sig;
}
return shared_ptr<view::Signal>();
// 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();
{
lock_guard<mutex> lock(_data_mutex);
- const unsigned int probe_count = g_slist_length(analog.channels);
- const size_t sample_count = analog.num_samples / probe_count;
+ const unsigned int channel_count = g_slist_length(analog.channels);
+ const size_t sample_count = analog.num_samples / channel_count;
const float *data = analog.data;
bool sweep_beginning = false;
{
shared_ptr<data::AnalogSnapshot> snapshot;
- sr_channel *const probe = (sr_channel*)p->data;
- assert(probe);
+ sr_channel *const channel = (sr_channel*)p->data;
+ assert(channel);
- // Try to get the snapshot of the probe
+ // Try to get the snapshot of the channel
const map< const sr_channel*, shared_ptr<data::AnalogSnapshot> >::
- iterator iter = _cur_analog_snapshots.find(probe);
+ iterator iter = _cur_analog_snapshots.find(channel);
if (iter != _cur_analog_snapshots.end())
snapshot = (*iter).second;
else
// in the sweep containing this snapshot.
sweep_beginning = true;
- // Create a snapshot, keep it in the maps of probes
+ // Create a snapshot, keep it in the maps of channels
snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(_dev_inst->get_sample_limit()));
- _cur_analog_snapshots[probe] = snapshot;
+ _cur_analog_snapshots[channel] = snapshot;
- // Find the annalog data associated with the probe
+ // Find the annalog data associated with the channel
shared_ptr<view::AnalogSignal> sig =
dynamic_pointer_cast<view::AnalogSignal>(
- signal_from_probe(probe));
+ signal_from_channel(channel));
assert(sig);
shared_ptr<data::Analog> data(sig->analog_data());
// Append the samples in the snapshot
snapshot->append_interleaved_samples(data++, sample_count,
- probe_count);
+ channel_count);
}
if (sweep_beginning) {
frame_ended();
break;
}
+ default:
+ break;
}
}
projects / pulseview.git / blobdiff