X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=07d8ccc05249ffa3bed1be1f923fa15e3c3ef962;hb=f1a79caedd1a0b1b3a9b8d4c889147570f7627f1;hp=458a9d69a71d64c2bda65cb24f3ad0b85e24394e;hpb=a9627352f283dd4f83906dc1710a1d9d327fbe57;p=pulseview.git

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 458a9d6..07d8ccc 100644
--- 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;
 
@@ -106,6 +106,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_EXTERNAL_CLOCK:
 		case SR_CONF_RLE:
 		case SR_CONF_POWER_OFF:
+		case SR_CONF_AVERAGING:
 			bind_bool(name, "", get, set);
 			break;
 
@@ -128,6 +129,10 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 				bind_int(name, "", "", pair<int64_t, int64_t>(1, 500), get, set);
 			break;
 
+		case SR_CONF_AVG_SAMPLES:
+			bind_int(name, "", "", pair<int64_t, int64_t>(0, INT32_MAX), get, set);
+			break;
+
 		default:
 			break;
 		}
@@ -158,7 +163,7 @@ void Device::bind_enum(const QString &name, const QString &desc,
 
 		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)));