X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=0f904d0d1cf300cf406b75d4751b46a5b3ed67a5;hp=556f54e5d5c938454a49486a7aac011bf561c26a;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=ff008de665c7990d5f3408f918ff090d8e6c60b2

diff --git a/pv/session.hpp b/pv/session.hpp
index 556f54e5..0f904d0d 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_SIGSESSION_HPP
+#define PULSEVIEW_PV_SIGSESSION_HPP
 
 #include <map>
 #include <memory>
@@ -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_;
 
@@ -188,4 +192,4 @@ Q_SIGNALS:
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_HPP