SigSession: Made _sr_session non-static

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index a06de7e14db9ae7e83813932d95c7fec1ae8a5cc..cea426a0d2eb12833a1a9b1f705188cee91c95dc 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -32,11 +32,19 @@
 #include <QObject>
 #include <QString>
 
-#include <libsigrok/libsigrok.h>
-
 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 DeviceManager;
@@ -49,10 +57,6 @@ class LogicSnapshot;
 class SignalData;
 }
 
-namespace device {
-class DevInst;
-}
-
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -75,21 +79,19 @@ public:
 
        ~SigSession();
 
-       std::shared_ptr<device::DevInst> get_device() const;
+       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<device::DevInst> dev_inst)
-               throw(QString);
+       void set_device(std::shared_ptr<sigrok::Device> device);
 
-       void set_file(const std::string &name)
-               throw(QString);
+       void set_file(const std::string &name);
 
        void set_default_device();
 
-       void release_device(device::DevInst *dev_inst);
-
        capture_state get_capture_state() const;
 
        void start_capture(std::function<void (const QString)> error_handler);
@@ -113,56 +115,39 @@ public:
 private:
        void set_capture_state(capture_state state);
 
-       void update_signals(std::shared_ptr<device::DevInst> dev_inst);
+       void update_signals(std::shared_ptr<sigrok::Device> device);
 
-       std::shared_ptr<view::Signal> signal_from_probe(
-               const sr_channel *probe) const;
+       std::shared_ptr<view::Signal> signal_from_channel(
+               std::shared_ptr<sigrok::Channel> channel) const;
 
-       void read_sample_rate(const sr_dev_inst *const sdi);
+       void read_sample_rate(std::shared_ptr<sigrok::Device>);
 
 private:
-       /**
-        * 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,
-               std::function<void (const QString)> error_handler,
-               sr_input_format *format = NULL);
-
-       void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
+       void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
                std::function<void (const QString)> error_handler);
 
-       void feed_in_header(const sr_dev_inst *sdi);
+       void feed_in_header(std::shared_ptr<sigrok::Device> device);
 
-       void feed_in_meta(const sr_dev_inst *sdi,
-               const sr_datafeed_meta &meta);
+       void feed_in_meta(std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<sigrok::Meta> meta);
 
        void feed_in_frame_begin();
 
-       void feed_in_logic(const sr_datafeed_logic &logic);
-
-       void feed_in_analog(const sr_datafeed_analog &analog);
+       void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
 
-       void data_feed_in(const struct sr_dev_inst *sdi,
-               const struct sr_datafeed_packet *packet);
+       void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
 
-       static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-               const struct sr_datafeed_packet *packet, void *cb_data);
+       void data_feed_in(std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<sigrok::Packet> packet);
 
 private:
        DeviceManager &_device_manager;
+       std::shared_ptr<sigrok::Session> _session;
 
        /**
         * The device instance that will be used in the next capture session.
         */
-       std::shared_ptr<device::DevInst> _dev_inst;
+       std::shared_ptr<sigrok::Device> _device;
 
        std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
 
@@ -175,7 +160,7 @@ private:
        mutable std::mutex _data_mutex;
        std::shared_ptr<data::Logic> _logic_data;
        std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-       std::map< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
+       std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
                _cur_analog_snapshots;
 
        std::thread _sampling_thread;
@@ -190,22 +175,6 @@ Q_SIGNALS:
        void data_received();
 
        void frame_ended();
-
-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;
-
-public:
-       // TODO: Even more of a hack. The libsigrok API now allows for
-       // multiple sessions. However sr_session_* calls are scattered
-       // around the PV architecture and a single SigSession object is
-       // being used across multiple sequential sessions, which are
-       // created and destroyed in other classes in pv::device. This
-       // is a mess. For now just keep a single sr_session pointer here
-       // which we can use for all those scattered calls.
-       static struct sr_session *_sr_session;
 };
 
 } // namespace pv