X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdevicemanager.h;h=0a8f2e0dca7d24fedb53cf7b734d321320ff180a;hb=6842b5fc481eb43d9aeea81f17e211820d6dc405;hp=acef8a42d93ba2b1f1d1f5475717ab3a97557079;hpb=996b7c9da9b5cb56413e829217e1e7d7d7d520da;p=pulseview.git diff --git a/pv/devicemanager.h b/pv/devicemanager.h index acef8a42..0a8f2e0d 100644 --- a/pv/devicemanager.h +++ b/pv/devicemanager.h @@ -24,10 +24,10 @@ #include #include +#include +#include #include -#include - struct sr_context; struct sr_dev_driver; @@ -46,13 +46,16 @@ public: ~DeviceManager(); - const std::list< boost::shared_ptr >& + const std::list< std::shared_ptr >& devices() const; - std::list< boost::shared_ptr > driver_scan( + std::list< std::shared_ptr > driver_scan( struct sr_dev_driver *const driver, GSList *const drvopts = NULL); + const std::shared_ptr find_device_from_info( + const std::map search_info); + private: void init_drivers(); @@ -62,12 +65,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::list< std::shared_ptr > _devices; }; } // namespace pv