Moved all srd commands into decode thread, implemented error messages

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

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index 5a4b4a991f32adadca0c029b4227db0b5e5f694a..09002ac911153ed06901af6ab1ba3e0927b1f4c7 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -29,16 +29,22 @@
 #include <boost/thread.hpp>
 
 #include <QObject>
+#include <QString>
+
+#include <glib.h>
 
 struct srd_decoder;
-struct srd_decoder_inst;
 struct srd_probe;
-struct srd_session;
+struct srd_proto_data;
+
+namespace DecoderTest {
+class TwoDecoder;
+}
 
 namespace pv {
 
 namespace view {
-class Signal;
+class LogicSignal;
 
 namespace decode {
 class Annotation;
@@ -62,7 +68,7 @@ private:
 public:
        Decoder(const srd_decoder *const decoder,
                std::map<const srd_probe*,
-                       boost::shared_ptr<pv::view::Signal> > probes,
+                       boost::shared_ptr<pv::view::LogicSignal> > probes,
                GHashTable *options);
 
        virtual ~Decoder();
@@ -72,6 +78,8 @@ public:
        const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                annotations() const;
 
+       QString error_message();
+
        void clear_snapshots();
 
 private:
@@ -89,18 +97,18 @@ signals:
 
 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::LogicSignal> >
                _probes;
        GHashTable *_options;
 
-       srd_session *_session;
-       srd_decoder_inst *_decoder_inst;
-
-       mutable boost::mutex _annotations_mutex;
+       mutable boost::mutex _mutex;
        std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                _annotations;
+       QString _error_message;
 
        boost::thread _decode_thread;
+
+       friend class DecoderTest::TwoDecoder;
 };
 
 } // namespace data