X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdevicemanager.h;h=acef8a42d93ba2b1f1d1f5475717ab3a97557079;hb=32d83ce1a26322a433785746ea7465f9bdf830b6;hp=3ed74e078f2baa3234b9807eb6d62e4e2af6f7ac;hpb=945745012eb57cefa1ef457daf48cfffa99f9ec2;p=pulseview.git

diff --git a/pv/devicemanager.h b/pv/devicemanager.h
index 3ed74e07..acef8a42 100644
--- a/pv/devicemanager.h
+++ b/pv/devicemanager.h
@@ -24,7 +24,6 @@
 #include <glib.h>
 
 #include <list>
-#include <map>
 #include <string>
 
 #include <boost/shared_ptr.hpp>
@@ -37,7 +36,7 @@ namespace pv {
 class SigSession;
 
 namespace device {
-class DevInst;
+class Device;
 }
 
 class DeviceManager
@@ -47,15 +46,10 @@ public:
 
 	~DeviceManager();
 
-	const std::list< boost::shared_ptr<pv::device::DevInst> >&
+	const std::list< boost::shared_ptr<pv::device::Device> >&
 		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< boost::shared_ptr<pv::device::Device> > driver_scan(
 		struct sr_dev_driver *const driver,
 		GSList *const drvopts = NULL);
 
@@ -68,14 +62,12 @@ private:
 
 	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(boost::shared_ptr<device::Device> a,
+		boost::shared_ptr<device::Device> b);
 
 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< boost::shared_ptr<pv::device::Device> > _devices;
 };
 
 } // namespace pv