X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=ca2659b175815aa02e05711f4d22b5724bf768bd;hb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f;hp=eb25629fe68fa0f5f94d165ca6f5d7a0a66e222e;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index eb25629f..ca2659b1 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -20,12 +20,13 @@
 
 #include <cassert>
 
-#include "analog.h"
-#include "analogsnapshot.h"
+#include "analog.hpp"
+#include "analogsegment.hpp"
 
 using std::deque;
 using std::max;
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -35,25 +36,31 @@ Analog::Analog() :
 {
 }
 
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
 {
-	snapshots_.push_front(snapshot);
+	segments_.push_front(segment);
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
 {
-	return snapshots_;
+	return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
+{
+	return vector< shared_ptr<Segment> >(
+		segments_.begin(), segments_.end());
 }
 
 void Analog::clear()
 {
-	snapshots_.clear();
+	segments_.clear();
 }
 
-uint64_t Analog::get_max_sample_count() const
+uint64_t Analog::max_sample_count() const
 {
 	uint64_t l = 0;
-	for (const std::shared_ptr<AnalogSnapshot> s : snapshots_) {
+	for (const std::shared_ptr<AnalogSegment> s : segments_) {
 		assert(s);
 		l = max(l, s->get_sample_count());
 	}