X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalogsnapshot.cpp;h=9e9b5a0ffeb8bb3ce0c8b6adb3e5289b9213c4d6;hb=84a0d458a4b04141dd45af6dec44d36782ee163e;hp=4907d7954a186af7c6d7b5f0c2c8447714edc32a;hpb=bb2cdfffd5817feb7a6dcde19b6110a6c253a261;p=pulseview.git diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp index 4907d79..9e9b5a0 100644 --- a/pv/data/analogsnapshot.cpp +++ b/pv/data/analogsnapshot.cpp @@ -27,12 +27,10 @@ #include -#include - #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 lock(_mutex); memset(_envelope_levels, 0, sizeof(_envelope_levels)); } @@ -57,7 +57,7 @@ AnalogSnapshot::AnalogSnapshot() : AnalogSnapshot::~AnalogSnapshot() { lock_guard lock(_mutex); - BOOST_FOREACH(Envelope &e, _envelope_levels) + for (Envelope &e : _envelope_levels) free(e.samples); }