projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untangle the time formatting functions a bit
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index 35840909b9b5b543a20c8e430d9bb6387b514883..03f4f0ebabdfc4cae68af572163d1b5345e49a98 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-102,7
+102,7
@@
bool Decoder::have_required_channels() 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 = channels_.cbegin(); i != channels_.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());
@@
-111,7
+111,7
@@
set< shared_ptr<pv::data::Logic> > Decoder::get_data()
return data;
}
return data;
}
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session
, int unit_size
) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
{
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);
@@
-128,14
+128,14
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
session, decoder_->id, opt_hash);
g_hash_table_destroy(opt_hash);
session, decoder_->id, opt_hash);
g_hash_table_destroy(opt_hash);
- if(!decoder_inst)
- return
NULL
;
+ if
(!decoder_inst)
+ return
nullptr
;
// Setup the channels
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
// Setup the channels
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(auto i = channels_.cbegin(); i != channels_.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(
@@
-144,7
+144,7
@@
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
g_hash_table_insert(channels, (*i).first->id, gvar);
}
g_hash_table_insert(channels, (*i).first->id, gvar);
}
- srd_inst_channel_set_all(decoder_inst, channels
, unit_size
);
+ srd_inst_channel_set_all(decoder_inst, channels);
return decoder_inst;
}
return decoder_inst;
}