projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read out the sample rate when loading files
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index f4e3d4af34d70b21cebe96992fc8f755797fb8a1..88c603e20127baeb171d97b3ddbb154762c5d7cf 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-56,6
+56,7
@@
class SigSession : public QObject
public:
enum capture_state {
Stopped,
public:
enum capture_state {
Stopped,
+ AwaitingTrigger,
Running
};
Running
};
@@
-91,7
+92,11
@@
public:
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
- void update_signals();
+ void update_signals(const sr_dev_inst *const sdi);
+
+ bool is_trigger_enabled() const;
+
+ void read_sample_rate(const sr_dev_inst *const sdi);
private:
/**
private:
/**
@@
-109,7
+114,10
@@
private:
boost::function<void (const QString)> error_handler,
sr_input_format *format = NULL);
boost::function<void (const QString)> error_handler,
sr_input_format *format = NULL);
- void load_thread_proc(const std::string name,
+ void load_session_thread_proc(
+ boost::function<void (const QString)> error_handler);
+
+ void load_input_thread_proc(const std::string name, sr_input *in,
boost::function<void (const QString)> error_handler);
void sample_thread_proc(struct sr_dev_inst *sdi,
boost::function<void (const QString)> error_handler);
void sample_thread_proc(struct sr_dev_inst *sdi,