Refactoring in View and SigSession

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 50768e6caf037152aafc62cf21ebae4799c4fb83..748b81ffae3f193ba17363c6c640dc22e2ed3d50 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
@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -35,6 +35,7 @@
 #include <libsigrok/libsigrok.h>
 
 struct srd_decoder;
+struct srd_probe;
 
 namespace pv {
 
@@ -48,7 +49,8 @@ class LogicSnapshot;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -88,11 +90,16 @@ public:
        void stop_capture();
 
        std::vector< boost::shared_ptr<view::Signal> >
-               get_signals();
+               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::vector< boost::shared_ptr<view::DecodeTrace> >
+               get_decode_signals() const;
+
+       void remove_decode_signal(view::DecodeTrace *signal);
+#endif
 
 private:
        void set_capture_state(capture_state state);
@@ -152,7 +159,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;
@@ -166,7 +173,7 @@ private:
        boost::shared_ptr<data::Analog> _analog_data;
        boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
 
-       std::auto_ptr<boost::thread> _sampling_thread;
+       boost::thread _sampling_thread;
 
 signals:
        void capture_state_changed(int state);