projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use namespaces in enum.cpp
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 5bdd23456cfbdf88e7044d638ef434897efe2557..af01ec40a0a59b695bf639bbff367422bc56e306 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 {
@@
-83,7
+81,7
@@
private:
void load_thread_proc(const std::string name);
void sample_thread_proc(struct sr_dev_inst *sdi,
void load_thread_proc(const std::string name);
void sample_thread_proc(struct sr_dev_inst *sdi,
- uint64_t record_length);
+ uint64_t record_length
, uint64_t sample_rate
);
void feed_in_header(const sr_dev_inst *sdi);
void feed_in_header(const sr_dev_inst *sdi);
@@
-103,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;