projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Add boost-thread as explicit dependency.
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 307330ecb3e40065cc26b5dd8a05b6617b71ace3..b4f07db4394397579e8d429bf9d9ca3d763e88b5 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-47,6
+47,12
@@
class SigSession : public QObject
{
Q_OBJECT
{
Q_OBJECT
+public:
+ enum capture_state {
+ Stopped,
+ Running
+ };
+
public:
SigSession();
public:
SigSession();
@@
-54,14
+60,21
@@
public:
void load_file(const std::string &name);
void load_file(const std::string &name);
+ 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,
uint64_t sample_rate);
+ void stop_capture();
+
std::vector< boost::shared_ptr<view::Signal> >
get_signals();
boost::shared_ptr<LogicData> get_data();
std::vector< boost::shared_ptr<view::Signal> >
get_signals();
boost::shared_ptr<LogicData> get_data();
+private:
+ void set_capture_state(capture_state state);
+
private:
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length, uint64_t sample_rate);
private:
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length, uint64_t sample_rate);
@@
-73,6
+86,9
@@
private:
struct sr_datafeed_packet *packet);
private:
struct sr_datafeed_packet *packet);
private:
+ mutable boost::mutex _state_mutex;
+ capture_state _capture_state;
+
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;
@@
-83,6
+99,8
@@
private:
std::auto_ptr<boost::thread> _sampling_thread;
signals:
std::auto_ptr<boost::thread> _sampling_thread;
signals:
+ void capture_state_changed(int state);
+
void signals_changed();
void data_updated();
void signals_changed();
void data_updated();