X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.h;h=2ce523dc6251d424921bba5a696a2fbcdcd100bd;hb=85843b14c48affe67820ec8c9e357cd26e0ed943;hp=891ba3d2c1ac28a254917a7da49def32828779d2;hpb=19adbc2c342b190161ec1223377a3619974b91f7;p=pulseview.git

diff --git a/pv/devicemanager.h b/pv/devicemanager.h
index 891ba3d..2ce523d 100644
--- a/pv/devicemanager.h
+++ b/pv/devicemanager.h
@@ -34,9 +34,12 @@ struct sr_dev_driver;
 
 namespace pv {
 
-class DevInst;
 class SigSession;
 
+namespace device {
+class Device;
+}
+
 class DeviceManager
 {
 public:
@@ -44,14 +47,15 @@ public:
 
 	~DeviceManager();
 
-	const std::list< boost::shared_ptr<pv::DevInst> >& devices() const;
+	const std::list< boost::shared_ptr<pv::device::Device> >&
+		devices() const;
 
-	void use_device(boost::shared_ptr<pv::DevInst> dev_inst,
+	void use_device(boost::shared_ptr<pv::device::Device> dev_inst,
 		SigSession *owner);
 
-	void release_device(boost::shared_ptr<pv::DevInst> dev_inst);
+	void release_device(boost::shared_ptr<pv::device::Device> dev_inst);
 
-	std::list< boost::shared_ptr<DevInst> > driver_scan(
+	std::list< boost::shared_ptr<pv::device::Device> > driver_scan(
 		struct sr_dev_driver *const driver,
 		GSList *const drvopts = NULL);
 
@@ -64,13 +68,13 @@ private:
 
 	void release_driver(struct sr_dev_driver *const driver);
 
-	static bool compare_devices(boost::shared_ptr<DevInst> a,
-		boost::shared_ptr<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::DevInst> > _devices;
-	std::map< boost::shared_ptr<pv::DevInst>, pv::SigSession*>
+	std::list< boost::shared_ptr<pv::device::Device> > _devices;
+	std::map< boost::shared_ptr<pv::device::Device>, pv::SigSession*>
 		_used_devices;
 };