X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalog.cpp;h=3f96dae1afe566e61d512176d4d1cf2d6fbdd08d;hb=99503171d4f32570829df171521b4b9cbccb0503;hp=8245186b97ab21af6b89d8d9f54e4137bbd519a6;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd;p=pulseview.git

diff --git a/pv/data/analog.cpp b/pv/data/analog.cpp
index 8245186..3f96dae 100644
--- a/pv/data/analog.cpp
+++ b/pv/data/analog.cpp
@@ -18,29 +18,53 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "analog.h"
-#include "analogsnapshot.h"
+#include <cassert>
 
-using namespace boost;
-using namespace std;
+#include "analog.hpp"
+#include "analogsnapshot.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
 
-Analog::Analog(const sr_datafeed_meta_analog&,
-	uint64_t samplerate) :
-	SignalData(samplerate)
+Analog::Analog() :
+	SignalData()
 {
 }
 
 void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
 {
-	_snapshots.push_front(snapshot);
+	snapshots_.push_front(snapshot);
+}
+
+const deque< shared_ptr<AnalogSnapshot> >& Analog::analog_snapshots() const
+{
+	return snapshots_;
+}
+
+vector< shared_ptr<Snapshot> > Analog::snapshots() const
+{
+	return vector< shared_ptr<Snapshot> >(
+		snapshots_.begin(), snapshots_.end());
+}
+
+void Analog::clear()
+{
+	snapshots_.clear();
 }
 
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+uint64_t Analog::get_max_sample_count() const
 {
-	return _snapshots;
+	uint64_t l = 0;
+	for (const std::shared_ptr<AnalogSnapshot> s : snapshots_) {
+		assert(s);
+		l = max(l, s->get_sample_count());
+	}
+	return l;
 }
 
 } // namespace data