projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed sample_rate parameter from start_capture
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 177e47c9b0ccc1d3cc20385f16b9d5e1e75426d9..7805eec65085ee24d7d2f8917eb09f0eca774172 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-30,9
+30,7
@@
#include <QObject>
#include <QObject>
-extern "C" {
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-}
namespace pv {
namespace pv {
@@
-66,8
+64,8
@@
public:
capture_state get_capture_state() const;
capture_state get_capture_state() const;
- void start_capture(struct sr_dev_inst* sdi,
uint64_t record_length,
- uint64_t
sample_rate
);
+ void start_capture(struct sr_dev_inst* sdi,
+ uint64_t
record_length
);
void stop_capture();
void stop_capture();
@@
-85,6
+83,8
@@
private:
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length);
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length);
+ void feed_in_header(const sr_dev_inst *sdi);
+
void feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta);
void feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta);
@@
-101,7
+101,6
@@
private:
private:
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
private:
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
- uint64_t _sample_rate;
mutable boost::mutex _signals_mutex;
std::vector< boost::shared_ptr<view::Signal> > _signals;
mutable boost::mutex _signals_mutex;
std::vector< boost::shared_ptr<view::Signal> > _signals;