SigSession: Made _sr_session non-static

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 307330ecb3e40065cc26b5dd8a05b6617b71ace3..cea426a0d2eb12833a1a9b1f705188cee91c95dc 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
@@ -21,25 +21,45 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
+#include <map>
+#include <memory>
+#include <mutex>
+#include <set>
 #include <string>
-#include <utility>
+#include <thread>
 #include <vector>
 
 #include <QObject>
-
-extern "C" {
-#include <libsigrok/libsigrok.h>
+#include <QString>
+
+struct srd_decoder;
+struct srd_channel;
+
+namespace sigrok {
+       class Analog;
+       class Channel;
+       class Device;
+       class Logic;
+       class Meta;
+       class Packet;
+       class Session;
 }
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+class DeviceManager;
+
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+class SignalData;
+}
 
 namespace view {
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -48,50 +68,113 @@ class SigSession : public QObject
        Q_OBJECT
 
 public:
-       SigSession();
+       enum capture_state {
+               Stopped,
+               AwaitingTrigger,
+               Running
+       };
+
+public:
+       SigSession(DeviceManager &device_manager);
 
        ~SigSession();
 
-       void load_file(const std::string &name);
+       const std::shared_ptr<sigrok::Session>& session() const;
+
+       std::shared_ptr<sigrok::Device> device() const;
+
+       /**
+        * Sets device instance that will be used in the next capture session.
+        */
+       void set_device(std::shared_ptr<sigrok::Device> device);
 
-       void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-               uint64_t sample_rate);
+       void set_file(const std::string &name);
 
-       std::vector< boost::shared_ptr<view::Signal> >
-               get_signals();
+       void set_default_device();
 
-       boost::shared_ptr<LogicData> get_data();
+       capture_state get_capture_state() const;
+
+       void start_capture(std::function<void (const QString)> error_handler);
+
+       void stop_capture();
+
+       std::set< std::shared_ptr<data::SignalData> > get_data() const;
+
+       std::vector< std::shared_ptr<view::Signal> >
+               get_signals() const;
+
+#ifdef ENABLE_DECODE
+       bool add_decoder(srd_decoder *const dec);
+
+       std::vector< std::shared_ptr<view::DecodeTrace> >
+               get_decode_signals() const;
+
+       void remove_decode_signal(view::DecodeTrace *signal);
+#endif
 
 private:
-       void sample_thread_proc(struct sr_dev_inst *sdi,
-               uint64_t record_length, uint64_t sample_rate);
+       void set_capture_state(capture_state state);
+
+       void update_signals(std::shared_ptr<sigrok::Device> device);
 
-       void data_feed_in(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+       std::shared_ptr<view::Signal> signal_from_channel(
+               std::shared_ptr<sigrok::Channel> channel) const;
 
-       static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+       void read_sample_rate(std::shared_ptr<sigrok::Device>);
 
 private:
-       mutable boost::mutex _signals_mutex;
-       std::vector< boost::shared_ptr<view::Signal> > _signals;
+       void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
+               std::function<void (const QString)> error_handler);
 
-       mutable boost::mutex _data_mutex;
-       boost::shared_ptr<LogicData> _logic_data;
-       boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+       void feed_in_header(std::shared_ptr<sigrok::Device> device);
 
-       std::auto_ptr<boost::thread> _sampling_thread;
+       void feed_in_meta(std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<sigrok::Meta> meta);
 
-signals:
-       void signals_changed();
+       void feed_in_frame_begin();
+
+       void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
 
-       void data_updated();
+       void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
+
+       void data_feed_in(std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<sigrok::Packet> packet);
 
 private:
-       // TODO: This should not be necessary. Multiple concurrent
-       // sessions should should be supported and it should be
-       // possible to associate a pointer with a sr_session.
-       static SigSession *_session;
+       DeviceManager &_device_manager;
+       std::shared_ptr<sigrok::Session> _session;
+
+       /**
+        * The device instance that will be used in the next capture session.
+        */
+       std::shared_ptr<sigrok::Device> _device;
+
+       std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
+
+       mutable std::mutex _sampling_mutex;
+       capture_state _capture_state;
+
+       mutable std::mutex _signals_mutex;
+       std::vector< std::shared_ptr<view::Signal> > _signals;
+
+       mutable std::mutex _data_mutex;
+       std::shared_ptr<data::Logic> _logic_data;
+       std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+       std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
+               _cur_analog_snapshots;
+
+       std::thread _sampling_thread;
+
+Q_SIGNALS:
+       void capture_state_changed(int state);
+
+       void signals_changed();
+
+       void frame_began();
+
+       void data_received();
+
+       void frame_ended();
 };
 
 } // namespace pv