X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=3f96dae1afe566e61d512176d4d1cf2d6fbdd08d;hb=99503171d4f32570829df171521b4b9cbccb0503;hp=dd4097a8d2a7cea131e7d3eea6912a4caead690e;hpb=a007f5ad25bad88cf62443d5471449ce8a6f5f29;p=pulseview.git diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp index dd4097a8..3f96dae1 100644 --- a/pv/data/analog.cpp +++ b/pv/data/analog.cpp @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include -#include "analog.h" -#include "analogsnapshot.h" +#include "analog.hpp" +#include "analogsnapshot.hpp" -using namespace boost; -using namespace std; +using std::deque; +using std::max; +using std::shared_ptr; +using std::vector; namespace pv { namespace data { @@ -36,23 +38,29 @@ Analog::Analog() : void Analog::push_snapshot(shared_ptr &snapshot) { - _snapshots.push_front(snapshot); + snapshots_.push_front(snapshot); } -deque< shared_ptr >& Analog::get_snapshots() +const deque< shared_ptr >& Analog::analog_snapshots() const { - return _snapshots; + return snapshots_; +} + +vector< shared_ptr > Analog::snapshots() const +{ + 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; - BOOST_FOREACH(const boost::shared_ptr s, _snapshots) { + for (const std::shared_ptr s : snapshots_) { assert(s); l = max(l, s->get_sample_count()); }