projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
data
/
logic.h
diff --git
a/pv/data/logic.h
b/pv/data/logic.h
index 4b70b8f98bdb8028d09f0744e8db94ce0c81cc5b..d8ee5305ba72b43023ff09e492e9466b21f8f5ce 100644
(file)
--- a/
pv/data/logic.h
+++ b/
pv/data/logic.h
@@
-23,12
+23,8
@@
#include "signaldata.h"
#include "signaldata.h"
-#include <boost/shared_ptr.hpp>
#include <deque>
#include <deque>
-
-extern "C" {
-#include <libsigrok/libsigrok.h>
-}
+#include <memory>
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-38,19
+34,23
@@
class LogicSnapshot;
class Logic : public SignalData
{
public:
class Logic : public SignalData
{
public:
- Logic(
const sr_datafeed_meta_logic &meta, uint64_t samplerate
);
+ Logic(
unsigned int num_channels
);
- int get_num_
probe
s() const;
+ int get_num_
channel
s() const;
void push_snapshot(
void push_snapshot(
-
boost
::shared_ptr<LogicSnapshot> &snapshot);
+
std
::shared_ptr<LogicSnapshot> &snapshot);
- std::deque<
boost
::shared_ptr<LogicSnapshot> >&
+ std::deque<
std
::shared_ptr<LogicSnapshot> >&
get_snapshots();
get_snapshots();
+ void clear();
+
+ uint64_t get_max_sample_count() const;
+
private:
private:
- const
int _num_probes
;
- std::deque<
boost::shared_ptr<LogicSnapshot> > _snapshots
;
+ const
unsigned int num_channels_
;
+ std::deque<
std::shared_ptr<LogicSnapshot> > snapshots_
;
};
} // namespace data
};
} // namespace data