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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 8da89d09..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,25 +21,47 @@
 #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>
+#include <boost/thread.hpp>
 
-extern "C" {
-#include <libsigrok/libsigrok.h>
+#include <QObject>
+#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;
 }
 
@@ -50,61 +72,116 @@ 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);
+	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(std::shared_ptr<sigrok::Device> device);
+
+	void set_file(const std::string &name);
+
+	void set_default_device();
 
 	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(std::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
-	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+	std::set< std::shared_ptr<data::SignalData> > get_data() const;
+
+	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);
 
-	boost::shared_ptr<LogicData> get_data();
+	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 _state_mutex;
-	capture_state _capture_state;
+	void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
+		std::function<void (const QString)> error_handler);
 
-	mutable boost::mutex _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
+	void feed_in_header(std::shared_ptr<sigrok::Device> device);
 
-	mutable boost::mutex _data_mutex;
-	boost::shared_ptr<LogicData> _logic_data;
-	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
+		std::shared_ptr<sigrok::Meta> meta);
 
-	std::auto_ptr<boost::thread> _sampling_thread;
+	void feed_in_frame_begin();
 
-signals:
-	void signals_changed();
+	void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
+
+	void feed_in_analog(std::shared_ptr<sigrok::Analog> analog);
 
-	void data_updated();
+	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 boost::shared_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