projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show the file-device in the selector when a file is loaded
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index bed7474d12957eeb578d4d91b7d465af36b65ae6..7e61d8dfab705f89c1277278b21a0c522cd53c45 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-81,12
+81,13
@@
public:
/**
* Sets device instance that will be used in the next capture session.
*/
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+ void set_device(boost::shared_ptr<device::DevInst> dev_inst)
+ throw(QString);
- void release_device(device::DevInst *dev_inst);
+ void set_file(const std::string &name)
+ throw(QString);
- void load_file(const std::string &name,
- boost::function<void (const QString)> error_handler);
+ void release_device(device::DevInst *dev_inst);
capture_state get_capture_state() const;
capture_state get_capture_state() const;
@@
-113,7
+114,7
@@
private:
void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
-
bool is_trigger_enabled() const
;
+
void set_default_device()
;
boost::shared_ptr<view::Signal> signal_from_probe(
const sr_probe *probe) const;
boost::shared_ptr<view::Signal> signal_from_probe(
const sr_probe *probe) const;
@@
-136,12
+137,6
@@
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_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(boost::shared_ptr<device::DevInst> dev_inst,
boost::function<void (const QString)> error_handler);
void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
boost::function<void (const QString)> error_handler);