Feed analog data into separate deinterleaved analog data objects per channel

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 8b97f8c0364eedd1fcf60a9bd2782e800d46314f..cda49b5ca5c3ada9a3b4853c61909a6aa66d35a6 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,6 +47,7 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
@@ -89,11 +91,11 @@ public:
 
        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);
 
@@ -110,6 +112,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:
@@ -172,8 +177,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;