X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=3f96dae1afe566e61d512176d4d1cf2d6fbdd08d;hb=99503171d4f32570829df171521b4b9cbccb0503;hp=c7430432613c3eadbf373e25b16374f0a1cb980f;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;p=pulseview.git diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index c743043..3f96dae 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -18,12 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "analog.h" -#include "analogsnapshot.h" +#include + +#include "analog.hpp" +#include "analogsnapshot.hpp" -using boost::shared_ptr; using std::deque; using std::max; +using std::shared_ptr; +using std::vector; namespace pv { namespace data { @@ -35,23 +38,29 @@ Analog::Analog() : void Analog::push_snapshot(shared_ptr &snapshot) { - _snapshots.push_front(snapshot); + snapshots_.push_front(snapshot); +} + +const deque< shared_ptr >& Analog::analog_snapshots() const +{ + return snapshots_; } -deque< shared_ptr >& Analog::get_snapshots() +vector< shared_ptr > Analog::snapshots() const { - return _snapshots; + return vector< shared_ptr >( + snapshots_.begin(), snapshots_.end()); } void Analog::clear() { - _snapshots.clear(); + snapshots_.clear(); } uint64_t Analog::get_max_sample_count() const { uint64_t l = 0; - for (const boost::shared_ptr s : _snapshots) { + for (const std::shared_ptr s : snapshots_) { assert(s); l = max(l, s->get_sample_count()); }