Modified header guards to match file names

[pulseview.git] / pv / data / analog.cpp

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index dba99253eeb7a77f559f537cf7cf03b652adcbab..c95fffaf247518454b065ef9775cb5dcab8a2447 100644 (file)
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -21,11 +21,12 @@
 #include <cassert>
 
 #include "analog.hpp"
-#include "analogsnapshot.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);
 }
 
-const deque< shared_ptr<AnalogSnapshot> >& Analog::analog_snapshots() const
+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 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());
        }