Snapshot classes: Use vector instead of raw pointer

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

diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp
index 4907d7954a186af7c6d7b5f0c2c8447714edc32a..2a14d1ea0a0f37bf7687ca3f2f48f864e1849497 100644 (file)
--- a/pv/data/analogsnapshot.cpp
+++ b/pv/data/analogsnapshot.cpp
@@ -27,12 +27,10 @@
 
 #include <algorithm>
 
-#include <boost/foreach.hpp>
-
 #include "analogsnapshot.h"
 
-using boost::lock_guard;
-using boost::recursive_mutex;
+using std::lock_guard;
+using std::recursive_mutex;
 using std::max;
 using std::max_element;
 using std::min;
@@ -47,9 +45,11 @@ const float AnalogSnapshot::LogEnvelopeScaleFactor =
        logf(EnvelopeScaleFactor);
 const uint64_t AnalogSnapshot::EnvelopeDataUnit = 64*1024;     // bytes
 
-AnalogSnapshot::AnalogSnapshot() :
+AnalogSnapshot::AnalogSnapshot(const uint64_t expected_num_samples) :
        Snapshot(sizeof(float))
 {
+       set_capacity(expected_num_samples);
+
        lock_guard<recursive_mutex> lock(_mutex);
        memset(_envelope_levels, 0, sizeof(_envelope_levels));
 }
@@ -57,7 +57,7 @@ AnalogSnapshot::AnalogSnapshot() :
 AnalogSnapshot::~AnalogSnapshot()
 {
        lock_guard<recursive_mutex> lock(_mutex);
-       BOOST_FOREACH(Envelope &e, _envelope_levels)
+       for (Envelope &e : _envelope_levels)
                free(e.samples);
 }
 
@@ -68,9 +68,9 @@ void AnalogSnapshot::append_interleaved_samples(const float *data,
 
        lock_guard<recursive_mutex> lock(_mutex);
 
-       _data = realloc(_data, (_sample_count + sample_count) * sizeof(float));
+       _data.resize((_sample_count + sample_count) * sizeof(float));
 
-       float *dst = (float*)_data + _sample_count;
+       float *dst = (float*)_data.data() + _sample_count;
        const float *dst_end = dst + sample_count;
        while (dst != dst_end)
        {
@@ -96,7 +96,7 @@ const float* AnalogSnapshot::get_samples(
        lock_guard<recursive_mutex> lock(_mutex);
 
        float *const data = new float[end_sample - start_sample];
-       memcpy(data, (float*)_data + start_sample, sizeof(float) *
+       memcpy(data, (float*)_data.data() + start_sample, sizeof(float) *
                (end_sample - start_sample));
        return data;
 }
@@ -156,9 +156,9 @@ void AnalogSnapshot::append_payload_to_envelope_levels()
        dest_ptr = e0.samples + prev_length;
 
        // Iterate through the samples to populate the first level mipmap
-       const float *const end_src_ptr = (float*)_data +
+       const float *const end_src_ptr = (float*)_data.data() +
                e0.length * EnvelopeScaleFactor;
-       for (const float *src_ptr = (float*)_data +
+       for (const float *src_ptr = (float*)_data.data() +
                prev_length * EnvelopeScaleFactor;
                src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor)
        {