Refactoring in View and SigSession

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 68b14e11036f491d0acb6b19dad7717271566b4a..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
@@ -21,25 +21,36 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
+
+struct srd_decoder;
+struct srd_probe;
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+class DeviceManager;
+
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -50,55 +61,119 @@ class SigSession : public QObject
 public:
        enum capture_state {
                Stopped,
+               AwaitingTrigger,
                Running
        };
 
 public:
-       SigSession();
+       SigSession(DeviceManager &device_manager);
 
        ~SigSession();
 
-       void load_file(const std::string &name);
+       struct sr_dev_inst* get_device() const;
+
+       /**
+        * Sets device instance that will be used in the next capture session.
+        */
+       void set_device(struct sr_dev_inst *sdi);
+
+       void release_device(struct sr_dev_inst *sdi);
+
+       void load_file(const std::string &name,
+               boost::function<void (const QString)> error_handler);
 
        capture_state get_capture_state() const;
 
-       void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-               uint64_t sample_rate);
+       void start_capture(uint64_t record_length,
+               boost::function<void (const QString)> error_handler);
 
        void stop_capture();
 
        std::vector< boost::shared_ptr<view::Signal> >
-               get_signals();
+               get_signals() const;
+
+#ifdef ENABLE_DECODE
+       bool add_decoder(srd_decoder *const dec);
 
-       boost::shared_ptr<LogicData> get_data();
+       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);
 
+       void update_signals(const sr_dev_inst *const sdi);
+
+       bool is_trigger_enabled() const;
+
+       void read_sample_rate(const sr_dev_inst *const sdi);
+
 private:
-       void load_thread_proc(const std::string name);
+       /**
+        * Attempts to autodetect the format. Failing that
+        * @param filename The filename of the input file.
+        * @return A pointer to the 'struct sr_input_format' that should be
+        *      used, or NULL if no input format was selected or
+        *      auto-detected.
+        */
+       static sr_input_format* determine_input_file_format(
+               const std::string &filename);
+
+       static sr_input* load_input_file_format(
+               const std::string &filename,
+               boost::function<void (const QString)> error_handler,
+               sr_input_format *format = NULL);
+
+       void load_session_thread_proc(
+               boost::function<void (const QString)> error_handler);
+
+       void load_input_thread_proc(const std::string name, sr_input *in,
+               boost::function<void (const QString)> error_handler);
 
        void sample_thread_proc(struct sr_dev_inst *sdi,
-               uint64_t record_length, uint64_t sample_rate);
+               uint64_t record_length,
+               boost::function<void (const QString)> error_handler);
+
+       void feed_in_header(const sr_dev_inst *sdi);
+
+       void feed_in_meta(const sr_dev_inst *sdi,
+               const sr_datafeed_meta &meta);
+
+       void feed_in_logic(const sr_datafeed_logic &logic);
+
+       void feed_in_analog(const sr_datafeed_analog &analog);
 
        void data_feed_in(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet);
 
        static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet, void *cb_data);
 
 private:
-       mutable boost::mutex _state_mutex;
+       DeviceManager &_device_manager;
+
+       /**
+        * The device instance that will be used in the next capture session.
+        */
+       struct sr_dev_inst *_sdi;
+
+       std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+
+       mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;
 
        mutable boost::mutex _signals_mutex;
        std::vector< boost::shared_ptr<view::Signal> > _signals;
 
        mutable boost::mutex _data_mutex;
-       boost::shared_ptr<LogicData> _logic_data;
-       boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+       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::auto_ptr<boost::thread> _sampling_thread;
+       boost::thread _sampling_thread;
 
 signals:
        void capture_state_changed(int state);