X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdevicemanager.h;h=ca86a7fe9c15c69f727ccbf3b04711a8650e8250;hb=abad24e2d61c0c84ac8495c22d29a8a3a49ee9fa;hp=2ce523dc6251d424921bba5a696a2fbcdcd100bd;hpb=85843b14c48affe67820ec8c9e357cd26e0ed943;p=pulseview.git diff --git a/pv/devicemanager.h b/pv/devicemanager.h index 2ce523dc..ca86a7fe 100644 --- a/pv/devicemanager.h +++ b/pv/devicemanager.h @@ -24,11 +24,9 @@ #include #include -#include +#include #include -#include - struct sr_context; struct sr_dev_driver; @@ -47,15 +45,10 @@ public: ~DeviceManager(); - const std::list< boost::shared_ptr >& + const std::list< std::shared_ptr >& devices() const; - void use_device(boost::shared_ptr dev_inst, - SigSession *owner); - - void release_device(boost::shared_ptr dev_inst); - - std::list< boost::shared_ptr > driver_scan( + std::list< std::shared_ptr > driver_scan( struct sr_dev_driver *const driver, GSList *const drvopts = NULL); @@ -68,14 +61,12 @@ private: void release_driver(struct sr_dev_driver *const driver); - static bool compare_devices(boost::shared_ptr a, - boost::shared_ptr b); + static bool compare_devices(std::shared_ptr a, + std::shared_ptr b); private: struct sr_context *const _sr_ctx; - std::list< boost::shared_ptr > _devices; - std::map< boost::shared_ptr, pv::SigSession*> - _used_devices; + std::list< std::shared_ptr > _devices; }; } // namespace pv