X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=513177be356a24ac5fe88e1acbe75702a58fa68e;hp=8b97f8c0364eedd1fcf60a9bd2782e800d46314f;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=269528f55e7fd77f762c2008d257921cd30e1519

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 8b97f8c0..513177be 100644
--- 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,21 +21,31 @@
 #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 <memory>
+#include <mutex>
+#include <set>
 #include <string>
+#include <thread>
 #include <vector>
 
+#include <boost/thread.hpp>
+
 #include <QObject>
 #include <QString>
 
-#include <libsigrok/libsigrok.h>
-
 struct srd_decoder;
-struct srd_probe;
+struct srd_channel;
+
+namespace sigrok {
+	class Analog;
+	class Channel;
+	class Device;
+	class Logic;
+	class Meta;
+	class Packet;
+	class Session;
+}
 
 namespace pv {
 
@@ -46,6 +56,7 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
@@ -70,34 +81,39 @@ public:
 
 	~SigSession();
 
-	struct sr_dev_inst* get_device() const;
+	DeviceManager& device_manager();
+
+	const DeviceManager& device_manager() 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(struct sr_dev_inst *sdi);
+	void set_device(std::shared_ptr<sigrok::Device> device);
 
-	void release_device(struct sr_dev_inst *sdi);
+	void set_file(const std::string &name);
 
-	void load_file(const std::string &name,
-		boost::function<void (const QString)> error_handler);
+	void set_default_device();
 
 	capture_state get_capture_state() const;
 
-	void start_capture(uint64_t record_length,
-		boost::function<void (const QString)> error_handler);
+	void start_capture(std::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
-	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals() const;
+	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	boost::shared_ptr<data::Logic> get_data();
+	boost::shared_mutex& signals_mutex() const;
+
+	const std::vector< std::shared_ptr<view::Signal> >& signals() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
 
-	std::vector< boost::shared_ptr<view::DecodeTrace> >
+	std::vector< std::shared_ptr<view::DecodeTrace> >
 		get_decode_signals() const;
 
 	void remove_decode_signal(view::DecodeTrace *signal);
@@ -106,89 +122,66 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(const sr_dev_inst *const sdi);
+	void update_signals(std::shared_ptr<sigrok::Device> device);
 
-	bool is_trigger_enabled() 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,
-		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 sample_thread_proc(std::shared_ptr<sigrok::Device> device,
+		std::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 feed_in_header(std::shared_ptr<sigrok::Device> device);
 
-	void sample_thread_proc(struct sr_dev_inst *sdi,
-		uint64_t record_length,
-		boost::function<void (const QString)> error_handler);
+	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
+		std::shared_ptr<sigrok::Meta> meta);
 
-	void feed_in_header(const sr_dev_inst *sdi);
+	void feed_in_frame_begin();
 
-	void feed_in_meta(const sr_dev_inst *sdi,
-		const sr_datafeed_meta &meta);
+	void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
 
-	void feed_in_logic(const sr_datafeed_logic &logic);
+	void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
 
-	void feed_in_analog(const sr_datafeed_analog &analog);
-
-	void data_feed_in(const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet);
-
-	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;
+	DeviceManager &device_manager_;
+	std::shared_ptr<sigrok::Session> session_;
 
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	struct sr_dev_inst *_sdi;
+	std::shared_ptr<sigrok::Device> device_;
 
-	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-	mutable boost::mutex _sampling_mutex;
-	capture_state _capture_state;
+	mutable std::mutex sampling_mutex_;
+	capture_state capture_state_;
 
-	mutable boost::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
+	mutable boost::shared_mutex signals_mutex_;
+	std::vector< std::shared_ptr<view::Signal> > signals_;
 
-	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;
+	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_;
 
-	boost::thread _sampling_thread;
+	std::thread sampling_thread_;
 
-signals:
+Q_SIGNALS:
 	void capture_state_changed(int state);
 
 	void signals_changed();
 
-	void data_updated();
+	void frame_began();
 
-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;
+	void data_received();
+
+	void frame_ended();
 };
 
 } // namespace pv