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

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 0765cac645c87315c43ca64ab39e16ac319a6cf4..fb487a8163feb38861cf0f384a792d2704ebbf2c 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -19,16 +19,23 @@
  */
 
 #include "devicemanager.h"
+#include "device/device.h"
 #include "sigsession.h"
 
 #include <cassert>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
+#include <boost/foreach.hpp>
+
 #include <libsigrok/libsigrok.h>
 
-using namespace std;
+using boost::shared_ptr;
+using std::list;
+using std::map;
+using std::ostringstream;
+using std::runtime_error;
+using std::string;
 
 namespace pv {
 
@@ -44,44 +51,23 @@ DeviceManager::~DeviceManager()
        release_devices();
 }
 
-const std::list<sr_dev_inst*>& DeviceManager::devices() const
+const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
 {
        return _devices;
 }
 
-void DeviceManager::use_device(sr_dev_inst *sdi, SigSession *owner)
-{
-       assert(sdi);
-       assert(owner);
-
-       _used_devices[sdi] = owner;
-
-       sr_dev_open(sdi);
-}
-
-void DeviceManager::release_device(sr_dev_inst *sdi)
-{
-       assert(sdi);
-
-       // Notify the owner, and removed the device from the used device list
-       _used_devices[sdi]->release_device(sdi);
-       _used_devices.erase(sdi);
-
-       sr_dev_close(sdi);
-}
-
-list<sr_dev_inst*> DeviceManager::driver_scan(
+list< shared_ptr<device::Device> > DeviceManager::driver_scan(
        struct sr_dev_driver *const driver, GSList *const drvopts)
 {
-       list<sr_dev_inst*> 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<sr_dev_inst*>::iterator i = _devices.begin();
+       list< shared_ptr<device::Device> >::iterator i = _devices.begin();
        while (i != _devices.end()) {
-               if ((*i)->driver == driver)
+               if ((*i)->dev_inst()->driver == driver)
                        i = _devices.erase(i);
                else
                        i++;
@@ -93,7 +79,8 @@ list<sr_dev_inst*> 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((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);
 
@@ -105,31 +92,6 @@ list<sr_dev_inst*> DeviceManager::driver_scan(
        return driver_devices;
 }
 
-string DeviceManager::format_device_title(const sr_dev_inst *const sdi)
-{
-       ostringstream s;
-
-       assert(sdi);
-
-       if (sdi->vendor && sdi->vendor[0]) {
-               s << sdi->vendor;
-               if ((sdi->model && sdi->model[0]) ||
-                       (sdi->version && sdi->version[0]))
-                       s << ' ';
-       }
-
-       if (sdi->model && sdi->model[0]) {
-               s << sdi->model;
-               if (sdi->version && sdi->version[0])
-                       s << ' ';
-       }
-
-       if (sdi->version && sdi->version[0])
-               s << sdi->version;
-
-       return s.str();
-}
-
 void DeviceManager::init_drivers()
 {
        // Initialise all libsigrok drivers
@@ -146,11 +108,10 @@ void DeviceManager::init_drivers()
 void DeviceManager::release_devices()
 {
        // Release all the used devices
-       for (map<sr_dev_inst*, 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();
@@ -168,29 +129,22 @@ void DeviceManager::scan_all_drivers()
 
 void DeviceManager::release_driver(struct sr_dev_driver *const driver)
 {
-       assert(driver);
-       for (map<sr_dev_inst*, SigSession*>::iterator i = _used_devices.begin();
-               i != _used_devices.end(); i++)
-               if((*i).first->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);
-               }
+       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(const sr_dev_inst *const a,
-       const sr_dev_inst *const b)
+bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
+       shared_ptr<device::Device> b)
 {
-       return format_device_title(a).compare(format_device_title(b)) < 0;
+       assert(a);
+       assert(b);
+       return a->format_device_title().compare(b->format_device_title()) < 0;
 }
 
 } // namespace pv