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 458a9d69a71d64c2bda65cb24f3ad0b85e24394e..a347f784510a6b012fd5abec8873be74cba7b03d 100644 (file)
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -32,7 +32,6 @@
 using boost::optional;
 
 using std::function;
 using boost::optional;
 
 using std::function;

-using std::make_pair;

 using std::pair;
 using std::set;
 using std::shared_ptr;
 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();
                string name_str;
                try {
                        name_str = key->description();

-               } catch (Error e) {
+               } catch (Error& e) {

                        name_str = key->name();
                }
 
                        name_str = key->name();
                }
 


@@ -89,8 +88,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
                        break;
 
                case SR_CONF_CAPTURE_RATIO:
                        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:
                        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_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;
 
                        bind_enum(name, "", key, capabilities, get, set);
                        break;
 


@@ -158,7 +158,7 @@ void Device::bind_enum(const QString &name, const QString &desc,
 
                vector< pair<Glib::VariantBase, QString> > values;
                while ((iter.next_value(gvar)))
 
                vector< pair<Glib::VariantBase, QString> > values;
                while ((iter.next_value(gvar)))

-                       values.push_back(make_pair(gvar, printer(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)));