#include <libsigrokdecode/libsigrokdecode.h>
-#include "decoderoptions.h"
+#include "decoderoptions.hpp"
#include <boost/none_t.hpp>
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/decoder.hpp>
+#include <pv/prop/double.hpp>
+#include <pv/prop/enum.hpp>
+#include <pv/prop/int.hpp>
+#include <pv/prop/string.hpp>
using boost::none;
using std::make_pair;
DecoderOptions::DecoderOptions(
shared_ptr<pv::data::DecoderStack> decoder_stack,
shared_ptr<data::decode::Decoder> decoder) :
- _decoder_stack(decoder_stack),
- _decoder(decoder)
+ decoder_stack_(decoder_stack),
+ decoder_(decoder)
{
- assert(_decoder);
+ assert(decoder_);
- const srd_decoder *const dec = _decoder->decoder();
+ const srd_decoder *const dec = decoder_->decoder();
assert(dec);
for (GSList *l = dec->options; l; l = l->next)
else
continue;
- _properties.push_back(prop);
+ properties_.push_back(prop);
}
}
{
GVariant *val = NULL;
- assert(_decoder);
+ assert(decoder_);
// Get the value from the hash table if it is already present
- const map<string, GVariant*>& options = _decoder->options();
+ const map<string, GVariant*>& options = decoder_->options();
const auto iter = options.find(id);
if (iter != options.end())
val = (*iter).second;
else
{
- assert(_decoder->decoder());
+ assert(decoder_->decoder());
// Get the default value if not
- for (GSList *l = _decoder->decoder()->options; l; l = l->next)
+ for (GSList *l = decoder_->decoder()->options; l; l = l->next)
{
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
void DecoderOptions::setter(const char *id, Glib::VariantBase value)
{
- assert(_decoder);
- _decoder->set_option(id, value.gobj());
+ assert(decoder_);
+ decoder_->set_option(id, value.gobj());
- assert(_decoder_stack);
- _decoder_stack->begin_decode();
+ assert(decoder_stack_);
+ decoder_stack_->begin_decode();
}
} // binding