DecodeSignal: Re-set decoder metadata after stack termination

[pulseview.git] / pv / devicemanager.cpp

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 35efa12786bb524003bbdbe0ff4eecf54d59927e..ca8f66bee5316e6116d4fb38afcbdd93ca78a24d 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -48,8 +48,6 @@ using std::string;
 using std::unique_ptr;
 using std::vector;
 
-using Glib::ustring;
-using Glib::Variant;
 using Glib::VariantBase;
 
 using sigrok::ConfigKey;
@@ -58,7 +56,8 @@ using sigrok::Driver;
 
 namespace pv {
 
-DeviceManager::DeviceManager(shared_ptr<Context> context, std::string driver) :
+DeviceManager::DeviceManager(shared_ptr<Context> context,
+       std::string driver, bool do_scan) :
        context_(context)
 {
        unique_ptr<QProgressDialog> progress(new QProgressDialog("",
@@ -86,6 +85,13 @@ DeviceManager::DeviceManager(shared_ptr<Context> context, std::string driver) :
         * best effort auto detection.
         */
        for (auto entry : context->drivers()) {
+               if (!do_scan)
+                       break;
+
+               // Skip drivers we won't scan anyway
+               if (!driver_supported(entry.second))
+                       continue;
+
                progress->setLabelText(QObject::tr("Scanning for %1...")
                        .arg(QString::fromStdString(entry.first)));
 
@@ -217,14 +223,8 @@ DeviceManager::drive_scan_options(vector<string> user_spec,
        return result;
 }
 
-list< shared_ptr<devices::HardwareDevice> >
-DeviceManager::driver_scan(
-       shared_ptr<Driver> driver, map<const ConfigKey *, VariantBase> drvopts)
+bool DeviceManager::driver_supported(shared_ptr<Driver> driver) const
 {
-       list< shared_ptr<devices::HardwareDevice> > driver_devices;
-
-       assert(driver);
-
        /*
         * We currently only support devices that can deliver samples at
         * a fixed samplerate (i.e. oscilloscopes and logic analysers).
@@ -232,9 +232,19 @@ DeviceManager::driver_scan(
         * @todo Add support for non-monotonic devices (DMMs, sensors, etc).
         */
        const auto keys = driver->config_keys();
-       bool supported_device = keys.count(ConfigKey::LOGIC_ANALYZER) |
-               keys.count(ConfigKey::OSCILLOSCOPE);
-       if (!supported_device)
+
+       return keys.count(ConfigKey::LOGIC_ANALYZER) | keys.count(ConfigKey::OSCILLOSCOPE);
+}
+
+list< shared_ptr<devices::HardwareDevice> >
+DeviceManager::driver_scan(
+       shared_ptr<Driver> driver, map<const ConfigKey *, VariantBase> drvopts)
+{
+       list< shared_ptr<devices::HardwareDevice> > driver_devices;
+
+       assert(driver);
+
+       if (!driver_supported(driver))
                return driver_devices;
 
        // Remove any device instances from this driver from the device