projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::DeviceManager now manages opening/closing devices
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index fa2c7af413db55b174ad78ffa85593f409e69975..ae33c3a8a508713acde59c650cfadaeb256e634e 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-36,6
+36,8
@@
namespace pv {
namespace pv {
+class DeviceManager;
+
namespace data {
class Analog;
class AnalogSnapshot;
namespace data {
class Analog;
class AnalogSnapshot;
@@
-58,13
+60,10
@@
public:
};
public:
};
public:
- SigSession();
+ SigSession(
DeviceManager &device_manager
);
~SigSession();
~SigSession();
- /**
- * Gets device instance that will be used in the next capture session.
- */
struct sr_dev_inst* get_device() const;
/**
struct sr_dev_inst* get_device() const;
/**
@@
-72,6
+71,8
@@
public:
*/
void set_device(struct sr_dev_inst *sdi);
*/
void set_device(struct sr_dev_inst *sdi);
+ void release_device(struct sr_dev_inst *sdi);
+
void load_file(const std::string &name,
boost::function<void (const QString)> error_handler);
void load_file(const std::string &name,
boost::function<void (const QString)> error_handler);
@@
-114,6
+115,7
@@
private:
const struct sr_datafeed_packet *packet, void *cb_data);
private:
const struct sr_datafeed_packet *packet, void *cb_data);
private:
+ DeviceManager &_device_manager;
/**
* The device instance that will be used in the next capture session.
/**
* The device instance that will be used in the next capture session.