projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added code to handle different integer types in the Int property.
[pulseview.git]
/
pv
/
prop
/
binding
/
decoderoptions.cpp
diff --git
a/pv/prop/binding/decoderoptions.cpp
b/pv/prop/binding/decoderoptions.cpp
index 435d5f6d8bac998e03cac28deb26818cf5a4c3b0..361d85b2bbbbec202638b28b67675ce4d7fff934 100644
(file)
--- a/
pv/prop/binding/decoderoptions.cpp
+++ b/
pv/prop/binding/decoderoptions.cpp
@@
-18,11
+18,16
@@
* 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 <libsigrokdecode/libsigrokdecode.h>
+
#include "decoderoptions.h"
#include "decoderoptions.h"
+#include <boost/bind.hpp>
#include <boost/foreach.hpp>
#include <boost/none_t.hpp>
#include <boost/foreach.hpp>
#include <boost/none_t.hpp>
+#include <pv/data/decoderstack.h>
+#include <pv/data/decode/decoder.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
#include <pv/prop/int.h>
#include <pv/prop/string.h>
@@
-33,15
+38,18
@@
namespace pv {
namespace prop {
namespace binding {
namespace prop {
namespace binding {
-DecoderOptions::DecoderOptions(const srd_decoder *decoder,
- GHashTable *options) :
- _decoder(decoder),
- _options(options)
+DecoderOptions::DecoderOptions(
+ shared_ptr<pv::data::DecoderStack> decoder_stack,
+ shared_ptr<data::decode::Decoder> decoder) :
+ _decoder_stack(decoder_stack),
+ _decoder(decoder)
{
{
- assert(decoder);
+ assert(
_
decoder);
+ const srd_decoder *const dec = _decoder->decoder();
+ assert(dec);
- for (GSList *l = dec
oder
->options; l; l = l->next)
+ for (GSList *l = dec->options; l; l = l->next)
{
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
{
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
@@
-70,18
+78,29
@@
DecoderOptions::DecoderOptions(const srd_decoder *decoder,
GVariant* DecoderOptions::getter(const char *id)
{
GVariant* DecoderOptions::getter(const char *id)
{
+ GVariant *val = NULL;
+
+ assert(_decoder);
+
// Get the value from the hash table if it is already present
// Get the value from the hash table if it is already present
- GVariant *val = (GVariant*)g_hash_table_lookup(_options, id);
+ const map<string, GVariant*>& options = _decoder->options();
+ map<string, GVariant*>::const_iterator iter = options.find(id);
- if (!val)
+ if (iter != options.end())
+ val = (*iter).second;
+ else
{
{
+ assert(_decoder->decoder());
+
// Get the default value if not
// Get the default value if not
- for (GSList *l = _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;
{
const srd_decoder_option *const opt =
(srd_decoder_option*)l->data;
- if (strcmp(opt->id, id) == 0)
+ if (strcmp(opt->id, id) == 0)
{
val = opt->def;
val = opt->def;
+ break;
+ }
}
}
}
}
@@
-93,8
+112,11
@@
GVariant* DecoderOptions::getter(const char *id)
void DecoderOptions::setter(const char *id, GVariant *value)
{
void DecoderOptions::setter(const char *id, GVariant *value)
{
- g_variant_ref(value);
- g_hash_table_insert(_options, (void*)id, value);
+ assert(_decoder);
+ _decoder->set_option(id, value);
+
+ assert(_decoder_stack);
+ _decoder_stack->begin_decode();
}
} // binding
}
} // binding