X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=9359176c784ac5ebbd633741e4d4eb9782dde19b;hp=307330ecb3e40065cc26b5dd8a05b6617b71ace3;hb=2b334bb4078d6e74e8ed4e3460c6596344dd9c8d;hpb=3868e5fa3081573891ff2ae5b9dd67eb4a6afa4b

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 307330ec..9359176c 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,41 @@
 #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 <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
+
+struct srd_decoder;
+struct srd_channel;
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+class DeviceManager;
+
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+class SignalData;
+}
+
+namespace device {
+class DevInst;
+}
 
 namespace view {
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -48,50 +64,133 @@ 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);
+	std::shared_ptr<device::DevInst> get_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 start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-		uint64_t sample_rate);
+	void set_file(const std::string &name)
+		throw(QString);
 
-	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+	void set_default_device();
 
-	boost::shared_ptr<LogicData> get_data();
+	void release_device(device::DevInst *dev_inst);
+
+	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<device::DevInst> dev_inst);
+
+	std::shared_ptr<view::Signal> signal_from_channel(
+		const sr_channel *channel) const;
+
+	void read_sample_rate(const sr_dev_inst *const sdi);
+
+private:
+	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
+		std::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_frame_begin();
+
+	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 _signals_mutex;
-	std::vector< boost::shared_ptr<view::Signal> > _signals;
+	DeviceManager &_device_manager;
 
-	mutable boost::mutex _data_mutex;
-	boost::shared_ptr<LogicData> _logic_data;
-	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+	/**
+	 * The device instance that will be used in the next capture session.
+	 */
+	std::shared_ptr<device::DevInst> _dev_inst;
 
-	std::auto_ptr<boost::thread> _sampling_thread;
+	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< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
+		_cur_analog_snapshots;
+
+	std::thread _sampling_thread;
+
+Q_SIGNALS:
+	void capture_state_changed(int state);
 
-signals:
 	void signals_changed();
 
-	void data_updated();
+	void frame_began();
+
+	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