projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enumerate probes when session is loaded
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 6e23c63240b21489e4031d5b1f3066a72d5603e3..805f6ae07efda2f153a2514a24a64607b2e0f54d 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-92,7
+92,7
@@
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;
bool is_trigger_enabled() const;
@@
-112,7
+112,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,