Made DeviceManager only handle Device objects

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index b854c05081123516948262249a632ca39372a80c..5844e80e75325ad91d1e9f93d8368e4e7630321e 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -49,12 +49,12 @@ DeviceManager::~DeviceManager()
        release_devices();
 }
 
-const list< shared_ptr<pv::device::DevInst> >& DeviceManager::devices() const
+const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
 {
        return _devices;
 }
 
-void DeviceManager::use_device(shared_ptr<device::DevInst> dev_inst,
+void DeviceManager::use_device(shared_ptr<device::Device> dev_inst,
        SigSession *owner)
 {
        assert(dev_inst);
@@ -65,12 +65,12 @@ void DeviceManager::use_device(shared_ptr<device::DevInst> dev_inst,
        sr_dev_open(dev_inst->dev_inst());
 }
 
-void DeviceManager::release_device(shared_ptr<device::DevInst> dev_inst)
+void DeviceManager::release_device(shared_ptr<device::Device> dev_inst)
 {
        assert(dev_inst);
 
        // Notify the owner, and remove the device from the used device list
-       map< shared_ptr<device::DevInst>, pv::SigSession*>::const_iterator
+       map< shared_ptr<device::Device>, pv::SigSession*>::const_iterator
                iter = _used_devices.find(dev_inst);
        assert(iter != _used_devices.end());
 
@@ -78,16 +78,16 @@ void DeviceManager::release_device(shared_ptr<device::DevInst> dev_inst)
        _used_devices.erase(dev_inst);
 }
 
-list< shared_ptr<device::DevInst> > DeviceManager::driver_scan(
+list< shared_ptr<device::Device> > DeviceManager::driver_scan(
        struct sr_dev_driver *const driver, GSList *const drvopts)
 {
-       list< shared_ptr<device::DevInst> > driver_devices;
+       list< shared_ptr<device::Device> > driver_devices;
 
        assert(driver);
 
        // Remove any device instances from this driver from the device
        // list. They will not be valid after the scan.
-       list< shared_ptr<device::DevInst> >::iterator i = _devices.begin();
+       list< shared_ptr<device::Device> >::iterator i = _devices.begin();
        while (i != _devices.end()) {
                if ((*i)->dev_inst()->driver == driver)
                        i = _devices.erase(i);
@@ -101,7 +101,7 @@ list< shared_ptr<device::DevInst> > DeviceManager::driver_scan(
        // Do the scan
        GSList *const devices = sr_driver_scan(driver, drvopts);
        for (GSList *l = devices; l; l = l->next)
-               driver_devices.push_back(shared_ptr<device::DevInst>(
+               driver_devices.push_back(shared_ptr<device::Device>(
                        new device::Device((sr_dev_inst*)l->data)));
        g_slist_free(devices);
        driver_devices.sort(compare_devices);
@@ -130,7 +130,7 @@ void DeviceManager::init_drivers()
 void DeviceManager::release_devices()
 {
        // Release all the used devices
-       for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
+       for (map<shared_ptr<device::Device>, SigSession*>::iterator i =
                _used_devices.begin(); i != _used_devices.end(); i++)
                release_device((*i).first);
 
@@ -153,7 +153,7 @@ void DeviceManager::scan_all_drivers()
 void DeviceManager::release_driver(struct sr_dev_driver *const driver)
 {
        assert(driver);
-       for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
+       for (map<shared_ptr<device::Device>, SigSession*>::iterator i =
                _used_devices.begin(); i != _used_devices.end(); i++)
                if((*i).first->dev_inst()->driver == driver)
                {
@@ -171,8 +171,8 @@ void DeviceManager::release_driver(struct sr_dev_driver *const driver)
        sr_dev_clear(driver);
 }
 
-bool DeviceManager::compare_devices(shared_ptr<device::DevInst> a,
-       shared_ptr<device::DevInst> b)
+bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
+       shared_ptr<device::Device> b)
 {
        assert(a);
        assert(b);