projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't join with non-threads. Fixes 323
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 6e2f2db8413a2b9917f246aa59ad539dda574f29..21ddb5fb766cff41da6a5d4ad63e7e02f0b3bd93 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-18,11
+18,14
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <boost/foreach.hpp>
+
#include "analog.h"
#include "analogsnapshot.h"
#include "analog.h"
#include "analogsnapshot.h"
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-47,5
+50,15
@@
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<AnalogSnapshot> s, _snapshots) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
+}
+
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv