Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 11a5fe3c2ff9564f56ae1dfaf33c81e23eb16859..fb487a8163feb38861cf0f384a792d2704ebbf2c 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -19,13 +19,15 @@
  */
 
 #include "devicemanager.h"
-#include "device/devinst.h"
+#include "device/device.h"
 #include "sigsession.h"
 
 #include <cassert>
 #include <stdexcept>
 #include <string>
 
+#include <boost/foreach.hpp>
+
 #include <libsigrok/libsigrok.h>
 
 using boost::shared_ptr;
@@ -49,45 +51,21 @@ 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,
-       SigSession *owner)
-{
-       assert(dev_inst);
-       assert(owner);
-
-       _used_devices[dev_inst] = owner;
-
-       sr_dev_open(dev_inst->dev_inst());
-}
-
-void DeviceManager::release_device(shared_ptr<device::DevInst> 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
-               iter = _used_devices.find(dev_inst);
-       assert(iter != _used_devices.end());
-
-       (*iter).second->release_device(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,8 +79,8 @@ 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>(
-                       new device::DevInst((sr_dev_inst*)l->data)));
+               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,11 +108,10 @@ void DeviceManager::init_drivers()
 void DeviceManager::release_devices()
 {
        // Release all the used devices
-       for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
-               _used_devices.begin(); i != _used_devices.end(); i++)
-               release_device((*i).first);
-
-       _used_devices.clear();
+       BOOST_FOREACH(shared_ptr<device::Device> dev, _devices) {
+               assert(dev);
+               dev->release();
+       }
 
        // Clear all the drivers
        sr_dev_driver **const drivers = sr_driver_list();
@@ -152,27 +129,18 @@ 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 =
-               _used_devices.begin(); i != _used_devices.end(); i++)
-               if((*i).first->dev_inst()->driver == driver)
-               {
-                       // Notify the current owner of the device
-                       (*i).second->release_device((*i).first);
-
-                       // Remove it from the used device list
-                       _used_devices.erase(i);
-
-                       // Close the device instance
-                       sr_dev_close((*i).first->dev_inst());
-               }
+       BOOST_FOREACH(shared_ptr<device::Device> dev, _devices) {
+               assert(dev);
+               if(dev->dev_inst()->driver == driver)
+                       dev->release();
+       }
 
        // Clear all the old device instances from this 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);