X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=9e3944b5974e4ce5fa1dbd9c2d268c1ebb1e72bd;hb=e6d42eec32b61b6831b7926a9d6a5cd03d1f3430;hp=7cb90bb8b9b8d9a964883b6f53d31c93071bbf3b;hpb=88fc05658247e71b8a3bfa8871d74bf923026f73;p=pulseview.git
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 7cb90bb..9e3944b 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -14,29 +14,34 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include "devicemanager.hpp"
#include "session.hpp"
#include
+#include
#include
#include
#include
#include
-#include
+#include
#include
#include
+#include
+
using boost::algorithm::join;
+using std::bind;
using std::dynamic_pointer_cast;
using std::list;
using std::map;
+using std::placeholders::_1;
+using std::placeholders::_2;
using std::remove_if;
using std::runtime_error;
using std::shared_ptr;
@@ -48,8 +53,6 @@ using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
-using sigrok::Device;
-using sigrok::HardwareDevice;
using sigrok::SessionDevice;
namespace pv {
@@ -61,8 +64,9 @@ DeviceManager::DeviceManager(shared_ptr context) :
driver_scan(entry.second, map());
}
-DeviceManager::~DeviceManager()
+const std::shared_ptr& DeviceManager::context() const
{
+ return context_;
}
shared_ptr DeviceManager::context()
@@ -70,89 +74,84 @@ shared_ptr DeviceManager::context()
return context_;
}
-const list< shared_ptr >& DeviceManager::devices() const
+const list< shared_ptr >&
+DeviceManager::devices() const
{
return devices_;
}
-list< shared_ptr > DeviceManager::driver_scan(
+list< shared_ptr >
+DeviceManager::driver_scan(
shared_ptr driver, map drvopts)
{
- list< shared_ptr > driver_devices;
+ list< shared_ptr > driver_devices;
assert(driver);
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
- devices_.remove_if([&](shared_ptr device) {
- return device->driver() == driver; });
+ devices_.remove_if([&](shared_ptr device) {
+ return device->hardware_device()->driver() == driver; });
// Do the scan
auto devices = driver->scan(drvopts);
- driver_devices.insert(driver_devices.end(), devices.begin(), devices.end());
// Add the scanned devices to the main list, set display names and sort.
+ for (shared_ptr device : devices) {
+ const shared_ptr d(
+ new devices::HardwareDevice(context_, device));
+ driver_devices.push_back(d);
+ }
+
devices_.insert(devices_.end(), driver_devices.begin(),
driver_devices.end());
-
- for (shared_ptr device : devices_)
- build_display_name(device);
-
- devices_.sort([&](shared_ptr a, shared_ptr b)
- { return compare_devices(a, b); });
-
- // As the display names depend on the complete devices_ list,
- // we need to recompute them. However, there is no need to
- // recomute all names of the devices_ list since only the
- // devices that use the given driver can be affected.
- for (shared_ptr device : driver_devices)
- build_display_name(device);
-
- driver_devices.sort([&](shared_ptr a, shared_ptr b)
- { return compare_devices(a, b); });
+ devices_.sort(bind(&DeviceManager::compare_devices, this, _1, _2));
+ driver_devices.sort(bind(
+ &DeviceManager::compare_devices, this, _1, _2));
return driver_devices;
}
const map DeviceManager::get_device_info(
- shared_ptr device)
+ shared_ptr device)
{
map result;
assert(device);
- if (device->vendor().length() > 0)
- result["vendor"] = device->vendor();
- if (device->model().length() > 0)
- result["model"] = device->model();
- if (device->version().length() > 0)
- result["version"] = device->version();
- if (device->serial_number().length() > 0)
- result["serial_num"] = device->serial_number();
- if (device->connection_id().length() > 0)
- result["connection_id"] = device->connection_id();
+ const shared_ptr sr_dev = device->device();
+ if (sr_dev->vendor().length() > 0)
+ result["vendor"] = sr_dev->vendor();
+ if (sr_dev->model().length() > 0)
+ result["model"] = sr_dev->model();
+ if (sr_dev->version().length() > 0)
+ result["version"] = sr_dev->version();
+ if (sr_dev->serial_number().length() > 0)
+ result["serial_num"] = sr_dev->serial_number();
+ if (sr_dev->connection_id().length() > 0)
+ result["connection_id"] = sr_dev->connection_id();
return result;
}
-const shared_ptr DeviceManager::find_device_from_info(
+const shared_ptr DeviceManager::find_device_from_info(
const map search_info)
{
- shared_ptr last_resort_dev;
+ shared_ptr last_resort_dev;
map dev_info;
- last_resort_dev = NULL;
-
- for (shared_ptr dev : devices_) {
+ for (shared_ptr dev : devices_) {
assert(dev);
dev_info = get_device_info(dev);
// If present, vendor and model always have to match.
if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0)
- if (dev_info.at("vendor") != search_info.at("vendor")) continue;
+ if (dev_info.at("vendor") != search_info.at("vendor"))
+ continue;
if (dev_info.count("model") > 0 && search_info.count("model") > 0)
- if (dev_info.at("model") != search_info.at("model")) continue;
+ if (dev_info.at("model") != search_info.at("model"))
+ continue;
// Most unique match: vendor/model/serial_num (but don't match a S/N of 0)
if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0")
@@ -186,77 +185,12 @@ const shared_ptr DeviceManager::find_device_from_info(
return last_resort_dev;
}
-void DeviceManager::build_display_name(shared_ptr device)
-{
- auto session_device = dynamic_pointer_cast(device);
- auto hardware_device = dynamic_pointer_cast(device);
-
- if (session_device) {
- full_names_[device] = display_names_[device] =
- boost::filesystem::path(
- session_device->parent()->filename()).filename().string();
- return;
- }
-
- // First, build the device's full name. It always contains all
- // possible information.
- vector parts = {device->vendor(), device->model(),
- device->version(), device->serial_number()};
-
- if (device->connection_id().length() > 0)
- parts.push_back("("+device->connection_id()+")");
-
- full_names_[device] = join(parts, " ");
-
- // Next, build the display name. It only contains fields as required.
- bool multiple_dev = false;
-
- // If we can find another device with the same model/vendor then
- // we have at least two such devices and need to distinguish them.
- if (hardware_device)
- multiple_dev = any_of(devices_.begin(), devices_.end(),
- [&](shared_ptr dev) {
- return (dev->vendor() == hardware_device->vendor() &&
- dev->model() == hardware_device->model()) &&
- dev != hardware_device;
- } );
-
- parts = {device->vendor(), device->model()};
-
- if (multiple_dev) {
- parts.push_back(device->version());
- parts.push_back(device->serial_number());
-
- if ((device->serial_number().length() == 0) &&
- (device->connection_id().length() > 0))
- parts.push_back("("+device->connection_id()+")");
- }
-
- display_names_[device] = join(parts, " ");
-}
-
-const std::string DeviceManager::get_display_name(std::shared_ptr dev)
-{
- return display_names_[dev];
-}
-
-const std::string DeviceManager::get_full_name(std::shared_ptr dev)
-{
- return full_names_[dev];
-}
-
-void DeviceManager::update_display_name(std::shared_ptr dev)
-{
- build_display_name(dev);
-}
-
-bool DeviceManager::compare_devices(shared_ptr a,
- shared_ptr b)
+bool DeviceManager::compare_devices(shared_ptr a,
+ shared_ptr b)
{
assert(a);
assert(b);
-
- return display_names_[a].compare(display_names_[b]) < 0;
+ return a->display_name(*this).compare(b->display_name(*this)) < 0;
}
} // namespace pv