X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=8f1860dc466b4622a5fc4e9e35891b445e5947a5;hb=7d80a6514b8a43c8035b718a6077106c825a7a44;hp=556f54e5d5c938454a49486a7aac011bf561c26a;hpb=ff008de665c7990d5f3408f918ff090d8e6c60b2;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 556f54e..8f1860d 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,13 +38,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,9 +53,9 @@ class DeviceManager;
 
 namespace data {
 class Analog;
-class AnalogSnapshot;
+class AnalogSegment;
 class Logic;
-class LogicSnapshot;
+class LogicSegment;
 class SignalData;
 }
 
@@ -94,7 +94,11 @@ public:
 	 */
 	void set_device(std::shared_ptr<sigrok::Device> device);
 
-	void set_file(const std::string &name);
+	/**
+	 * Sets a sigrok session file as the capture device.
+	 * @param name the path to the file.
+	 */
+	void set_session_file(const std::string &name);
 
 	void set_default_device();
 
@@ -167,9 +171,9 @@ private:
 	mutable std::mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
 	uint64_t cur_samplerate_;
-	std::shared_ptr<data::LogicSnapshot> cur_logic_snapshot_;
-	std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogSnapshot> >
-		cur_analog_snapshots_;
+	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_;