device.cpp: Add SR_CONF_EXTERNAL_CLOCK_SOURCE.

[pulseview.git] / pv / binding / device.cpp

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 401644fd0672fa616c5c21586f619590e8b1cff1..a347f784510a6b012fd5abec8873be74cba7b03d 100644 (file)
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -32,7 +32,6 @@
 using boost::optional;
 
 using std::function;
-using std::make_pair;
 using std::pair;
 using std::set;
 using std::shared_ptr;
@@ -69,7 +68,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                string name_str;
                try {
                        name_str = key->description();
-               } catch (Error e) {
+               } catch (Error& e) {
                        name_str = key->name();
                }
 
@@ -89,8 +88,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                        break;
 
                case SR_CONF_CAPTURE_RATIO:
-                       bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100),
-                               get, set);
+                       bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100), get, set);
                        break;
 
                case SR_CONF_PATTERN_MODE:
@@ -99,6 +97,8 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                case SR_CONF_TRIGGER_SLOPE:
                case SR_CONF_COUPLING:
                case SR_CONF_CLOCK_EDGE:
+               case SR_CONF_DATA_SOURCE:
+               case SR_CONF_EXTERNAL_CLOCK_SOURCE:
                        bind_enum(name, "", key, capabilities, get, set);
                        break;
 
@@ -147,20 +147,26 @@ void Device::bind_enum(const QString &name, const QString &desc,
        Property::Getter getter,
        Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
-       Glib::VariantBase gvar;
-       vector< pair<Glib::VariantBase, QString> > values;
-
        assert(configurable_);
 
        if (!capabilities.count(Capability::LIST))
                return;
 
-       Glib::VariantIter iter(configurable_->config_list(key));
-       while ((iter.next_value(gvar)))
-               values.push_back(make_pair(gvar, printer(gvar)));
+       try {
+               Glib::VariantContainerBase gvar = configurable_->config_list(key);
+               Glib::VariantIter iter(gvar);
+
+               vector< pair<Glib::VariantBase, QString> > values;
+               while ((iter.next_value(gvar)))
+                       values.emplace_back(gvar, printer(gvar));
+
+               properties_.push_back(shared_ptr<Property>(new Enum(name, desc, values,
+                       getter, setter)));
 
-       properties_.push_back(shared_ptr<Property>(new Enum(name, desc, values,
-               getter, setter)));
+       } catch (sigrok::Error& e) {
+               qDebug() << "Error: Listing device key" << name << "failed!";
+               return;
+       }
 }
 
 void Device::bind_int(const QString &name, const QString &desc, QString suffix,