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 cdeb7e7a59adc0a449937a7df5ec51a02d73f601..09002ac911153ed06901af6ab1ba3e0927b1f4c7 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -29,14 +29,17 @@
 #include <boost/thread.hpp>
 
 #include <QObject>
+#include <QString>
 
 #include <glib.h>
 
 struct srd_decoder;
-struct srd_decoder_inst;
 struct srd_probe;
 struct srd_proto_data;
-struct srd_session;
+
+namespace DecoderTest {
+class TwoDecoder;
+}
 
 namespace pv {
 
@@ -75,12 +78,14 @@ public:
        const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                annotations() const;
 
+       QString error_message();
+
        void clear_snapshots();
 
 private:
        void begin_decode();
 
-       bool init_decoder();
+       void init_decoder();
 
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
@@ -96,14 +101,14 @@ private:
                _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