X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2Fdata%2Fanalogsnapshot.cpp;h=3dd04ed6508f6a18a416bbb0445fd8a0172b9dd9;hp=4f32ebcafb4d56dbbc5491a915b6973995fe45fc;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d

diff --git a/test/data/analogsnapshot.cpp b/test/data/analogsnapshot.cpp
index 4f32ebca..3dd04ed6 100644
--- a/test/data/analogsnapshot.cpp
+++ b/test/data/analogsnapshot.cpp
@@ -20,12 +20,11 @@
 
 #include <extdef.h>
 
-#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
 
-#include "../../pv/data/analogsnapshot.h"
+#include <pv/data/analogsnapshot.hpp>
 
 using pv::data::AnalogSnapshot;
 
@@ -34,33 +33,25 @@ BOOST_AUTO_TEST_SUITE(AnalogSnapshotTest)
 void push_analog(AnalogSnapshot &s, unsigned int num_samples,
 	float value)
 {
-	sr_datafeed_analog analog;
-	analog.num_samples = num_samples;
+	float *const data = new float[num_samples];
+	for (unsigned int i = 0; i < num_samples; i++)
+		data[i] = value;
 
-	float *data = new float[num_samples];
-	analog.data = data;
-	while(num_samples-- != 0)
-		*data++ = value;
-
-	s.append_payload(analog);
-	delete[] (float*)analog.data;
+	s.append_interleaved_samples(data, num_samples, 1);
+	delete[] data;
 }
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
 	// Create an empty AnalogSnapshot object
-	sr_datafeed_analog analog;
-	analog.num_samples = 0;
-	analog.data = NULL;
-
-	AnalogSnapshot s(analog);
+	AnalogSnapshot s;
 
 	//----- Test AnalogSnapshot::push_analog -----//
 
 	BOOST_CHECK(s.get_sample_count() == 0);
 	for (unsigned int i = 0; i < AnalogSnapshot::ScaleStepCount; i++)
 	{
-		const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+		const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
 		BOOST_CHECK_EQUAL(m.length, 0);
 		BOOST_CHECK_EQUAL(m.data_length, 0);
 		BOOST_CHECK(m.samples == NULL);
@@ -74,7 +65,7 @@ BOOST_AUTO_TEST_CASE(Basic)
 	// There should not be enough samples to have a single mip map sample
 	for (unsigned int i = 0; i < AnalogSnapshot::ScaleStepCount; i++)
 	{
-		const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+		const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
 		BOOST_CHECK_EQUAL(m.length, 0);
 		BOOST_CHECK_EQUAL(m.data_length, 0);
 		BOOST_CHECK(m.samples == NULL);
@@ -85,7 +76,7 @@ BOOST_AUTO_TEST_CASE(Basic)
 
 	// There should now be enough data for exactly one sample
 	// in mip map level 0, and that sample should be 0
-	const AnalogSnapshot::Envelope &e0 = s._envelope_levels[0];
+	const AnalogSnapshot::Envelope &e0 = s.envelope_levels_[0];
 	BOOST_CHECK_EQUAL(e0.length, 1);
 	BOOST_CHECK_EQUAL(e0.data_length, AnalogSnapshot::EnvelopeDataUnit);
 	BOOST_REQUIRE(e0.samples != NULL);
@@ -95,7 +86,7 @@ BOOST_AUTO_TEST_CASE(Basic)
 	// The higher levels should still be empty
 	for (unsigned int i = 1; i < AnalogSnapshot::ScaleStepCount; i++)
 	{
-		const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+		const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
 		BOOST_CHECK_EQUAL(m.length, 0);
 		BOOST_CHECK_EQUAL(m.data_length, 0);
 		BOOST_CHECK(m.samples == NULL);
@@ -112,7 +103,7 @@ BOOST_AUTO_TEST_CASE(Basic)
 		BOOST_CHECK_EQUAL(e0.samples[i].max, -1.0f);
 	}
 
-	const AnalogSnapshot::Envelope &e1 = s._envelope_levels[1];
+	const AnalogSnapshot::Envelope &e1 = s.envelope_levels_[1];
 	BOOST_CHECK_EQUAL(e1.length, 1);
 	BOOST_CHECK_EQUAL(e1.data_length, AnalogSnapshot::EnvelopeDataUnit);
 	BOOST_REQUIRE(e1.samples != NULL);