projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::bind with C++11 lambdas
[pulseview.git]
/
pv
/
prop
/
binding
/
decoderoptions.h
diff --git
a/pv/prop/binding/decoderoptions.h
b/pv/prop/binding/decoderoptions.h
index e507e87c3accebafe17d356eace0a52dadc6defe..a0b8dc4d3880b04495edcb2e8d6726cd17ba095b 100644
(file)
--- a/
pv/prop/binding/decoderoptions.h
+++ b/
pv/prop/binding/decoderoptions.h
@@
-21,14
+21,19
@@
#ifndef PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
#define PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
#ifndef PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
#define PULSEVIEW_PV_PROP_BINDING_DECODEROPTIONS_H
-#include <glib.h>
-
#include "binding.h"
#include "binding.h"
+#include <pv/prop/property.h>
+
+struct srd_decoder_option;
+
namespace pv {
namespace data {
class DecoderStack;
namespace pv {
namespace data {
class DecoderStack;
+namespace decode {
+class Decoder;
+}
}
namespace prop {
}
namespace prop {
@@
-37,15
+42,21
@@
namespace binding {
class DecoderOptions : public Binding
{
public:
class DecoderOptions : public Binding
{
public:
- DecoderOptions(boost::shared_ptr<pv::data::DecoderStack> decoder);
+ DecoderOptions(std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+ std::shared_ptr<pv::data::decode::Decoder> decoder);
private:
private:
+ static std::shared_ptr<Property> bind_enum(const QString &name,
+ const srd_decoder_option *option,
+ Property::Getter getter, Property::Setter setter);
+
GVariant* getter(const char *id);
void setter(const char *id, GVariant *value);
private:
GVariant* getter(const char *id);
void setter(const char *id, GVariant *value);
private:
- boost::shared_ptr<pv::data::DecoderStack> _decoder;
+ std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+ std::shared_ptr<pv::data::decode::Decoder> _decoder;
};
} // binding
};
} // binding