X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=f0b4c1624b88d29a249c011e38e8f063651f2744;hb=ffe001198ecb5ea2e44c2947868c258afe948f20;hp=c6a317def7b61b5f1b61a6bef5ffa65847372fc4;hpb=f65cd27bdbf70644052dd43dac4bbe9403f4dfee;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index c6a317d..f0b4c16 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SIGSESSION_H
-#define PULSEVIEW_PV_SIGSESSION_H
+#ifndef PULSEVIEW_PV_SESSION_HPP
+#define PULSEVIEW_PV_SESSION_HPP
 
 #include <map>
 #include <memory>
@@ -27,8 +27,14 @@
 #include <set>
 #include <string>
 #include <thread>
+#include <unordered_set>
 #include <vector>
 
+#ifdef _WIN32
+// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
 #include <boost/thread.hpp>
 
 #include <QObject>
@@ -38,13 +44,13 @@ struct srd_decoder;
 struct srd_channel;
 
 namespace sigrok {
-	class Analog;
-	class Channel;
-	class Device;
-	class Logic;
-	class Meta;
-	class Packet;
-	class Session;
+class Analog;
+class Channel;
+class Device;
+class Logic;
+class Meta;
+class Packet;
+class Session;
 }
 
 namespace pv {
@@ -53,12 +59,16 @@ class DeviceManager;
 
 namespace data {
 class Analog;
-class AnalogSnapshot;
+class AnalogSegment;
 class Logic;
-class LogicSnapshot;
+class LogicSegment;
 class SignalData;
 }
 
+namespace devices {
+class Device;
+}
+
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -85,16 +95,14 @@ public:
 
 	const DeviceManager& device_manager() const;
 
-	const std::shared_ptr<sigrok::Session>& session() const;
+	std::shared_ptr<sigrok::Session> session() const;
 
-	std::shared_ptr<sigrok::Device> device() const;
+	std::shared_ptr<devices::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_device(std::shared_ptr<devices::Device> device);
 
 	void set_default_device();
 
@@ -108,7 +116,8 @@ public:
 
 	boost::shared_mutex& signals_mutex() const;
 
-	const std::vector< std::shared_ptr<view::Signal> >& signals() const;
+	const std::unordered_set< std::shared_ptr<view::Signal> >&
+		signals() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
@@ -122,21 +131,20 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(std::shared_ptr<sigrok::Device> device);
+	void update_signals();
 
 	std::shared_ptr<view::Signal> signal_from_channel(
 		std::shared_ptr<sigrok::Channel> channel) const;
 
-	void read_sample_rate(std::shared_ptr<sigrok::Device>);
+	void read_sample_rate(std::shared_ptr<sigrok::Device> device);
 
 private:
-	void sample_thread_proc(std::shared_ptr<sigrok::Device> device,
+	void sample_thread_proc(std::shared_ptr<devices::Device> device,
 		std::function<void (const QString)> error_handler);
 
-	void feed_in_header(std::shared_ptr<sigrok::Device> device);
+	void feed_in_header();
 
-	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Meta> meta);
+	void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
 
 	void feed_in_frame_begin();
 
@@ -149,12 +157,7 @@ private:
 
 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<sigrok::Device> device_;
+	std::shared_ptr<devices::Device> device_;
 
 	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
@@ -162,13 +165,14 @@ private:
 	capture_state capture_state_;
 
 	mutable boost::shared_mutex signals_mutex_;
-	std::vector< std::shared_ptr<view::Signal> > signals_;
+	std::unordered_set< 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_;
+	uint64_t cur_samplerate_;
+	std::shared_ptr<data::LogicSegment> cur_logic_segment_;
+	std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSegment> >
+		cur_analog_segments_;
 
 	std::thread sampling_thread_;
 
@@ -187,4 +191,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SESSION_HPP