* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <libsigrok/libsigrok.h>
+#include <cassert>
+
+#include <libsigrok/libsigrok.hpp>
#include <libsigrokdecode/libsigrokdecode.h>
#include "decoder.h"
#include <pv/view/logicsignal.h>
-using boost::shared_ptr;
using std::set;
using std::map;
+using std::shared_ptr;
using std::string;
namespace pv {
Decoder::~Decoder()
{
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.begin(); i != _options.end(); i++)
g_variant_unref((*i).second);
}
const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
Decoder::channels() const
{
- return _probes;
+ return _channels;
}
-void Decoder::set_probes(std::map<const srd_channel*,
- boost::shared_ptr<view::LogicSignal> > probes)
+void Decoder::set_channels(std::map<const srd_channel*,
+ std::shared_ptr<view::LogicSignal> > channels)
{
- _probes = probes;
+ _channels = channels;
}
const std::map<std::string, GVariant*>& Decoder::options() const
_options[id] = value;
}
-bool Decoder::have_required_probes() const
+bool Decoder::have_required_channels() const
{
for (GSList *l = _decoder->channels; l; l = l->next) {
const srd_channel *const pdch = (const srd_channel*)l->data;
assert(pdch);
- if (_probes.find(pdch) == _probes.end())
+ if (_channels.find(pdch) == _channels.end())
return false;
}
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
- for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
- {
+ for(auto i = _channels.cbegin(); i != _channels.cend(); i++) {
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.cbegin(); i != _options.cend(); i++)
{
GVariant *const value = (*i).second;
g_variant_ref(value);
if(!decoder_inst)
return NULL;
- // Setup the probes
- GHashTable *const probes = g_hash_table_new_full(g_str_hash,
+ // Setup the channels
+ GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
+ for(auto i = _channels.cbegin(); i != _channels.cend(); i++)
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(
- signal->probe()->index);
+ signal->channel()->index());
g_variant_ref_sink(gvar);
- g_hash_table_insert(probes, (*i).first->id, gvar);
+ g_hash_table_insert(channels, (*i).first->id, gvar);
}
- srd_inst_channel_set_all(decoder_inst, probes, unit_size);
+ srd_inst_channel_set_all(decoder_inst, channels, unit_size);
return decoder_inst;
}