pv::data::decode::Annotation: Add pd_index() and set_pd_index().

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index e0eb493853cb54d871f2aafc5e8e15b21376a232..3848a3d4d6267a35093471cd7495a32c75595821 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 #include <boost/thread.hpp>
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -46,10 +47,12 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -83,25 +86,23 @@ public:
 
        capture_state get_capture_state() const;
 
-       void start_capture(uint64_t record_length,
-               boost::function<void (const QString)> error_handler);
+       void start_capture(boost::function<void (const QString)> error_handler);
 
        void stop_capture();
 
+       std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
        std::vector< boost::shared_ptr<view::Signal> >
                get_signals() const;
 
-       boost::shared_ptr<data::Logic> get_data();
+#ifdef ENABLE_DECODE
+       bool add_decoder(srd_decoder *const dec);
 
-       void add_decoder(srd_decoder *const dec,
-               std::map<const srd_probe*,
-                       boost::shared_ptr<view::Signal> > probes,
-               GHashTable *options);
-
-       std::vector< boost::shared_ptr<view::DecodeSignal> >
+       std::vector< boost::shared_ptr<view::DecodeTrace> >
                get_decode_signals() const;
 
-       void remove_decode_signal(view::DecodeSignal *signal);
+       void remove_decode_signal(view::DecodeTrace *signal);
+#endif
 
 private:
        void set_capture_state(capture_state state);
@@ -110,6 +111,9 @@ private:
 
        bool is_trigger_enabled() const;
 
+       boost::shared_ptr<view::Signal> signal_from_probe(
+               const sr_probe *probe) const;
+
        void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
@@ -135,7 +139,6 @@ private:
                boost::function<void (const QString)> error_handler);
 
        void sample_thread_proc(struct sr_dev_inst *sdi,
-               uint64_t record_length,
                boost::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
@@ -161,7 +164,7 @@ private:
         */
        struct sr_dev_inst *_sdi;
 
-       std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+       std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
        mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;
@@ -172,8 +175,8 @@ private:
        mutable boost::mutex _data_mutex;
        boost::shared_ptr<data::Logic> _logic_data;
        boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-       boost::shared_ptr<data::Analog> _analog_data;
-       boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+       std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+               _cur_analog_snapshots;
 
        boost::thread _sampling_thread;