Add serial_num/connection_id handling and save/restore last device

[pulseview.git] / pv / devicemanager.h

diff --git a/pv/devicemanager.h b/pv/devicemanager.h
index b7f2d49a7e016ce49e6b66dc0124b17b1779dbb3..0a8f2e0dca7d24fedb53cf7b734d321320ff180a 100644 (file)
--- a/pv/devicemanager.h
+++ b/pv/devicemanager.h
@@ -25,16 +25,20 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <string>
 
 struct sr_context;
 struct sr_dev_driver;
-struct sr_dev_inst;
 
 namespace pv {
 
 class SigSession;
 
+namespace device {
+class Device;
+}
+
 class DeviceManager
 {
 public:
@@ -42,17 +46,15 @@ public:
 
        ~DeviceManager();
 
-       const std::list<sr_dev_inst*>& devices() const;
-
-       void use_device(sr_dev_inst *sdi, SigSession *owner);
-
-       void release_device(sr_dev_inst *sdi);
+       const std::list< std::shared_ptr<pv::device::Device> >&
+               devices() const;
 
-       std::list<sr_dev_inst*> driver_scan(
+       std::list< std::shared_ptr<pv::device::Device> > driver_scan(
                struct sr_dev_driver *const driver,
                GSList *const drvopts = NULL);
 
-       static std::string format_device_title(const sr_dev_inst *const sdi);
+       const std::shared_ptr<device::Device> find_device_from_info(
+               const std::map<std::string, std::string> search_info);
 
 private:
        void init_drivers();
@@ -63,13 +65,12 @@ private:
 
        void release_driver(struct sr_dev_driver *const driver);
 
-       static bool compare_devices(const sr_dev_inst *const a,
-               const sr_dev_inst *const b);
+       static bool compare_devices(std::shared_ptr<device::Device> a,
+               std::shared_ptr<device::Device> b);
 
 private:
        struct sr_context *const _sr_ctx;
-       std::list<sr_dev_inst*> _devices;
-       std::map<sr_dev_inst*, pv::SigSession*> _used_devices;
+       std::list< std::shared_ptr<pv::device::Device> > _devices;
 };
 
 } // namespace pv