projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index db9816c4169f6bc131330274c51a25de88e54ef9..e2db774283496c6d3d1d58dfa068317433050b56 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-18,7
+18,9
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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 <libsigrokdecode/libsigrokdecode.h>
#include "decoder.h"
@@
-35,62
+37,62
@@
namespace data {
namespace decode {
Decoder::Decoder(const srd_decoder *const dec) :
namespace decode {
Decoder::Decoder(const srd_decoder *const dec) :
-
_decoder
(dec),
-
_shown
(true)
+
decoder_
(dec),
+
shown_
(true)
{
}
Decoder::~Decoder()
{
{
}
Decoder::~Decoder()
{
- for (auto i =
_options.begin(); i != _options
.end(); i++)
+ for (auto i =
options_.begin(); i != options_
.end(); i++)
g_variant_unref((*i).second);
}
const srd_decoder* Decoder::decoder() const
{
g_variant_unref((*i).second);
}
const srd_decoder* Decoder::decoder() const
{
- return
_decoder
;
+ return
decoder_
;
}
bool Decoder::shown() const
{
}
bool Decoder::shown() const
{
- return
_shown
;
+ return
shown_
;
}
void Decoder::show(bool show)
{
}
void Decoder::show(bool show)
{
-
_shown
= show;
+
shown_
= show;
}
const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
Decoder::channels() const
{
}
const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
Decoder::channels() const
{
- return
_probes
;
+ return
channels_
;
}
}
-void Decoder::set_
probe
s(std::map<const srd_channel*,
- std::shared_ptr<view::LogicSignal> >
probe
s)
+void Decoder::set_
channel
s(std::map<const srd_channel*,
+ std::shared_ptr<view::LogicSignal> >
channel
s)
{
{
-
_probes = probe
s;
+
channels_ = channel
s;
}
const std::map<std::string, GVariant*>& Decoder::options() const
{
}
const std::map<std::string, GVariant*>& Decoder::options() const
{
- return
_options
;
+ return
options_
;
}
void Decoder::set_option(const char *id, GVariant *value)
{
assert(value);
g_variant_ref(value);
}
void Decoder::set_option(const char *id, GVariant *value)
{
assert(value);
g_variant_ref(value);
-
_options
[id] = value;
+
options_
[id] = value;
}
}
-bool Decoder::have_required_
probe
s() const
+bool Decoder::have_required_
channel
s() const
{
{
- for (GSList *l =
_decoder
->channels; l; l = l->next) {
+ for (GSList *l =
decoder_
->channels; l; l = l->next) {
const srd_channel *const pdch = (const srd_channel*)l->data;
assert(pdch);
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;
}
return false;
}
@@
-100,7
+102,7
@@
bool Decoder::have_required_probes() const
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
{
set< shared_ptr<pv::data::Logic> > data;
- for(auto i =
_probes.cbegin(); i != _probes
.cend(); i++) {
+ for(auto i =
channels_.cbegin(); i != channels_
.cend(); i++) {
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
shared_ptr<view::LogicSignal> signal((*i).second);
assert(signal);
data.insert(signal->logic_data());
@@
-114,7
+116,7
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (auto i =
_options.cbegin(); i != _options
.cend(); i++)
+ for (auto i =
options_.cbegin(); i != options_
.cend(); i++)
{
GVariant *const value = (*i).second;
g_variant_ref(value);
{
GVariant *const value = (*i).second;
g_variant_ref(value);
@@
-123,26
+125,26
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
}
srd_decoder_inst *const decoder_inst = srd_inst_new(
}
srd_decoder_inst *const decoder_inst = srd_inst_new(
- session,
_decoder
->id, opt_hash);
+ session,
decoder_
->id, opt_hash);
g_hash_table_destroy(opt_hash);
if(!decoder_inst)
return NULL;
g_hash_table_destroy(opt_hash);
if(!decoder_inst)
return NULL;
- // Setup the
probe
s
- GHashTable *const
probe
s = g_hash_table_new_full(g_str_hash,
+ // Setup the
channel
s
+ GHashTable *const
channel
s = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(auto i =
_probes.cbegin(); i != _probes
.cend(); i++)
+ for(auto i =
channels_.cbegin(); i != channels_
.cend(); i++)
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(
{
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_variant_ref_sink(gvar);
- g_hash_table_insert(
probe
s, (*i).first->id, gvar);
+ g_hash_table_insert(
channel
s, (*i).first->id, gvar);
}
}
- srd_inst_channel_set_all(decoder_inst,
probe
s, unit_size);
+ srd_inst_channel_set_all(decoder_inst,
channel
s, unit_size);
return decoder_inst;
}
return decoder_inst;
}