projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented decoder stacking
[pulseview.git]
/
pv
/
prop
/
binding
/
decoderoptions.cpp
diff --git
a/pv/prop/binding/decoderoptions.cpp
b/pv/prop/binding/decoderoptions.cpp
index dc3a8e974355c515322d3fb30e1920f4148afaab..34f1b813a6478012ceec15eaa7f6d704784ab525 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,13
+78,18
@@
DecoderOptions::DecoderOptions(const srd_decoder *decoder,
GVariant* DecoderOptions::getter(const char *id)
{
GVariant* DecoderOptions::getter(const char *id)
{
+ 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);
+ GVariant *val = (GVariant*)g_hash_table_lookup(
+ (GHashTable*)_decoder->options(), id);
if (!val)
{
if (!val)
{
+ 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;
@@
-95,8
+108,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*)g_strdup(id), value);
+ assert(_decoder);
+ _decoder->set_option(id, value);
+
+ assert(_decoder_stack);
+ _decoder_stack->begin_decode();
}
} // binding
}
} // binding