Added missing includes and defintions

[pulseview.git] / pv / data / decoder.h

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index dcf12fe1d4b5d2b8c6696442682bc9f5217ea2e6..93d8fa6a89fb8dae531e48d9f01e0f7c5d4526d7 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -28,47 +28,81 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <QObject>
+
+#include <glib.h>
+
 struct srd_decoder;
 struct srd_decoder_inst;
 struct srd_probe;
+struct srd_proto_data;
+struct srd_session;
 
 namespace pv {
 
 namespace view {
 class Signal;
+
+namespace decode {
+class Annotation;
+}
+
 }
 
 namespace data {
 
 class Logic;
 
-class Decoder : public SignalData
+class Decoder : public QObject, public SignalData
 {
+       Q_OBJECT
+
+private:
+       static const double DecodeMargin;
+       static const double DecodeThreshold;
+       static const int64_t DecodeChunkLength;
+
 public:
        Decoder(const srd_decoder *const decoder,
                std::map<const srd_probe*,
-                       boost::shared_ptr<pv::view::Signal> > probes);
+                       boost::shared_ptr<pv::view::Signal> > probes,
+               GHashTable *options);
 
        virtual ~Decoder();
 
        const srd_decoder* get_decoder() const;
 
-       void begin_decode();
+       const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+               annotations() const;
 
        void clear_snapshots();
 
 private:
+       void begin_decode();
+
        void init_decoder();
 
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
+       static void annotation_callback(srd_proto_data *pdata,
+               void *decoder);
+
+signals:
+       void new_decode_data();
+
 private:
        const srd_decoder *const _decoder;
        std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
                _probes;
+       GHashTable *_options;
 
+       srd_session *_session;
        srd_decoder_inst *_decoder_inst;
 
+       mutable boost::mutex _annotations_mutex;
+       std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
+               _annotations;
+
        boost::thread _decode_thread;
 };