projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new session API.
[pulseview.git]
/
pv
/
devicemanager.h
diff --git
a/pv/devicemanager.h
b/pv/devicemanager.h
index 3ed74e078f2baa3234b9807eb6d62e4e2af6f7ac..ca86a7fe9c15c69f727ccbf3b04711a8650e8250 100644
(file)
--- a/
pv/devicemanager.h
+++ b/
pv/devicemanager.h
@@
-24,11
+24,9
@@
#include <glib.h>
#include <list>
#include <glib.h>
#include <list>
-#include <m
ap
>
+#include <m
emory
>
#include <string>
#include <string>
-#include <boost/shared_ptr.hpp>
-
struct sr_context;
struct sr_dev_driver;
struct sr_context;
struct sr_dev_driver;
@@
-37,7
+35,7
@@
namespace pv {
class SigSession;
namespace device {
class SigSession;
namespace device {
-class Dev
Inst
;
+class Dev
ice
;
}
class DeviceManager
}
class DeviceManager
@@
-47,15
+45,10
@@
public:
~DeviceManager();
~DeviceManager();
- const std::list<
boost::shared_ptr<pv::device::DevInst
> >&
+ const std::list<
std::shared_ptr<pv::device::Device
> >&
devices() const;
devices() const;
- void use_device(boost::shared_ptr<pv::device::DevInst> dev_inst,
- SigSession *owner);
-
- void release_device(boost::shared_ptr<pv::device::DevInst> dev_inst);
-
- std::list< boost::shared_ptr<pv::device::DevInst> > driver_scan(
+ std::list< std::shared_ptr<pv::device::Device> > driver_scan(
struct sr_dev_driver *const driver,
GSList *const drvopts = NULL);
struct sr_dev_driver *const driver,
GSList *const drvopts = NULL);
@@
-68,14
+61,12
@@
private:
void release_driver(struct sr_dev_driver *const driver);
void release_driver(struct sr_dev_driver *const driver);
- static bool compare_devices(
boost::shared_ptr<device::DevInst
> a,
-
boost::shared_ptr<device::DevInst
> b);
+ static bool compare_devices(
std::shared_ptr<device::Device
> a,
+
std::shared_ptr<device::Device
> b);
private:
struct sr_context *const _sr_ctx;
private:
struct sr_context *const _sr_ctx;
- std::list< boost::shared_ptr<pv::device::DevInst> > _devices;
- std::map< boost::shared_ptr<pv::device::DevInst>, pv::SigSession*>
- _used_devices;
+ std::list< std::shared_ptr<pv::device::Device> > _devices;
};
} // namespace pv
};
} // namespace pv