projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified Decode to only use LogicSignals
[pulseview.git]
/
pv
/
data
/
decoder.h
diff --git
a/pv/data/decoder.h
b/pv/data/decoder.h
index c881403b42e22f8f1391d4d80c94e2ecaee1cf12..cdeb7e7a59adc0a449937a7df5ec51a02d73f601 100644
(file)
--- a/
pv/data/decoder.h
+++ b/
pv/data/decoder.h
@@
-30,14
+30,18
@@
#include <QObject>
#include <QObject>
+#include <glib.h>
+
struct srd_decoder;
struct srd_decoder_inst;
struct srd_probe;
struct srd_decoder;
struct srd_decoder_inst;
struct srd_probe;
+struct srd_proto_data;
+struct srd_session;
namespace pv {
namespace view {
namespace pv {
namespace view {
-class Signal;
+class
Logic
Signal;
namespace decode {
class Annotation;
namespace decode {
class Annotation;
@@
-61,7
+65,7
@@
private:
public:
Decoder(const srd_decoder *const decoder,
std::map<const srd_probe*,
public:
Decoder(const srd_decoder *const decoder,
std::map<const srd_probe*,
- boost::shared_ptr<pv::view::Signal> > probes,
+ boost::shared_ptr<pv::view::
Logic
Signal> > probes,
GHashTable *options);
virtual ~Decoder();
GHashTable *options);
virtual ~Decoder();
@@
-76,7
+80,7
@@
public:
private:
void begin_decode();
private:
void begin_decode();
-
void
init_decoder();
+
bool
init_decoder();
void decode_proc(boost::shared_ptr<data::Logic> data);
void decode_proc(boost::shared_ptr<data::Logic> data);
@@
-88,10
+92,11
@@
signals:
private:
const srd_decoder *const _decoder;
private:
const srd_decoder *const _decoder;
- std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
+ std::map<const srd_probe*, boost::shared_ptr<view::
Logic
Signal> >
_probes;
GHashTable *_options;
_probes;
GHashTable *_options;
+ srd_session *_session;
srd_decoder_inst *_decoder_inst;
mutable boost::mutex _annotations_mutex;
srd_decoder_inst *_decoder_inst;
mutable boost::mutex _annotations_mutex;