X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=bf92998b9b9e65fd7cd1ecf0d1d1c1564914f347;hp=20836901b006a981cebb107d88054e51ef98a899;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp index 2083690..bf92998 100644 --- a/pv/dialogs/connect.cpp +++ b/pv/dialogs/connect.cpp @@ -108,7 +108,7 @@ void Connect::populate_drivers() */ bool supported_device = driver->config_check( ConfigKey::LOGIC_ANALYZER, ConfigKey::DEVICE_OPTIONS) | - driver->config_check( + driver->config_check( ConfigKey::OSCILLOSCOPE, ConfigKey::DEVICE_OPTIONS); if (supported_device) @@ -172,12 +172,11 @@ void Connect::scan_pressed() const list< shared_ptr > devices = device_manager_.driver_scan(driver, drvopts); - for (shared_ptr device : devices) - { + for (shared_ptr device : devices) { assert(device); QString text = QString::fromStdString( - device_manager_.get_display_name(device)); + device->display_name(device_manager_)); text += QString(" with %1 channels").arg( device->device()->channels().size());