projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved pv::About into the pv::dialogs::About namespace
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 15e247b5953938c72f1e3c0639f8cae8ad031644..308b082730d13548f884b931e7bdc92cf46baf0f 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-36,6
+36,8
@@
extern "C" {
namespace pv {
namespace pv {
+class AnalogData;
+class AnalogDataSnapshot;
class LogicData;
class LogicDataSnapshot;
class LogicData;
class LogicDataSnapshot;
@@
-79,11
+81,18
@@
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 sample_rate
);
+ uint64_t record_length);
void feed_in_meta_logic(const struct sr_dev_inst *sdi,
const sr_datafeed_meta_logic &meta_logic);
void feed_in_meta_logic(const struct sr_dev_inst *sdi,
const sr_datafeed_meta_logic &meta_logic);
+ void feed_in_meta_analog(const struct sr_dev_inst *sdi,
+ const sr_datafeed_meta_analog &meta_analog);
+
+ void feed_in_logic(const sr_datafeed_logic &logic);
+
+ void feed_in_analog(const sr_datafeed_analog &analog);
+
void data_feed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet);
void data_feed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet);
@@
-91,8
+100,9
@@
private:
const struct sr_datafeed_packet *packet);
private:
const struct sr_datafeed_packet *packet);
private:
- mutable boost::mutex _s
tate
_mutex;
+ mutable boost::mutex _s
ampling
_mutex;
capture_state _capture_state;
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;
@@
-100,6
+110,8
@@
private:
mutable boost::mutex _data_mutex;
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
mutable boost::mutex _data_mutex;
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+ boost::shared_ptr<AnalogData> _analog_data;
+ boost::shared_ptr<AnalogDataSnapshot> _cur_analog_snapshot;
std::auto_ptr<boost::thread> _sampling_thread;
std::auto_ptr<boost::thread> _sampling_thread;