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
/
logicsnapshot.h
diff --git
a/pv/data/logicsnapshot.h
b/pv/data/logicsnapshot.h
index bcb644da58da7073831883920f4294535eae8a2d..db4d97b3b93ab59e6d1682c68567ebf33beb7972 100644
(file)
--- a/
pv/data/logicsnapshot.h
+++ b/
pv/data/logicsnapshot.h
@@
-26,6
+26,10
@@
#include <utility>
#include <vector>
#include <utility>
#include <vector>
+namespace sigrok {
+ class Logic;
+}
+
namespace LogicSnapshotTest {
struct Pow2;
struct Basic;
namespace LogicSnapshotTest {
struct Pow2;
struct Basic;
@@
-58,12
+62,12
@@
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
- LogicSnapshot(
const sr_datafeed_logic &
logic,
+ LogicSnapshot(
std::shared_ptr<sigrok::Logic>
logic,
uint64_t expected_num_samples = 0);
virtual ~LogicSnapshot();
uint64_t expected_num_samples = 0);
virtual ~LogicSnapshot();
- void append_payload(
const sr_datafeed_logic &
logic);
+ void append_payload(
std::shared_ptr<sigrok::Logic>
logic);
void get_samples(uint8_t *const data,
int64_t start_sample, int64_t end_sample) const;
void get_samples(uint8_t *const data,
int64_t start_sample, int64_t end_sample) const;
@@
-99,8
+103,8
@@
private:
static uint64_t pow2_ceil(uint64_t x, unsigned int power);
private:
static uint64_t pow2_ceil(uint64_t x, unsigned int power);
private:
- struct MipMapLevel
_mip_map
[ScaleStepCount];
- uint64_t
_last_append_sample
;
+ struct MipMapLevel
mip_map_
[ScaleStepCount];
+ uint64_t
last_append_sample_
;
friend struct LogicSnapshotTest::Pow2;
friend struct LogicSnapshotTest::Basic;
friend struct LogicSnapshotTest::Pow2;
friend struct LogicSnapshotTest::Basic;