Refactoring in View and SigSession

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6068b03c3058177261dbe9ff31a96d10f6405c7b..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
@@ -49,7 +49,8 @@ class LogicSnapshot;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -91,15 +92,15 @@ public:
        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);
-
-       std::vector< boost::shared_ptr<view::DecodeSignal> >
+       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);
 
@@ -158,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;