X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fdevice.cpp;h=855a1d82fca65019952b1baf46f21aef60c859de;hp=e33d27af08d1013da9c40c4f6440cf444cdd6922;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=a285ce3f0cba825ac302200d1078a6bcfaf60e27

diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp
index e33d27af..855a1d82 100644
--- a/pv/devices/device.cpp
+++ b/pv/devices/device.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -24,11 +23,10 @@
 
 #include "device.hpp"
 
-using std::map;
-using std::set;
+using std::shared_ptr;
 
 using sigrok::ConfigKey;
-using sigrok::Error;
+using sigrok::Capability;
 
 using Glib::VariantBase;
 using Glib::Variant;
@@ -36,19 +34,19 @@ using Glib::Variant;
 namespace pv {
 namespace devices {
 
-Device::Device() {
-}
-
-Device::~Device() {
+Device::~Device()
+{
 	if (session_)
 		session_->remove_datafeed_callbacks();
 }
 
-std::shared_ptr<sigrok::Session> Device::session() const {
+shared_ptr<sigrok::Session> Device::session() const
+{
 	return session_;
 }
 
-std::shared_ptr<sigrok::Device> Device::device() const {
+shared_ptr<sigrok::Device> Device::device() const
+{
 	return device_;
 }
 
@@ -60,38 +58,32 @@ template<typename T>
 T Device::read_config(const ConfigKey *key, const T default_value)
 {
 	assert(key);
-	map< const ConfigKey*, set<sigrok::Capability> > keys;
 
 	if (!device_)
 		return default_value;
 
-	try {
-		keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
-	} catch (const Error) {
+	if (!device_->config_check(key, Capability::GET))
 		return default_value;
-	}
 
-	const auto iter = keys.find(key);
-	if (iter == keys.end() ||
-		(*iter).second.find(sigrok::GET) == (*iter).second.end())
-		return default_value;
-
-	return VariantBase::cast_dynamic<Variant<T>>(
+	return VariantBase::cast_dynamic<Glib::Variant<guint64>>(
 		device_->config_get(ConfigKey::SAMPLERATE)).get();
 }
 
-void Device::start() {
+void Device::start()
+{
 	assert(session_);
 	session_->start();
 }
 
-void Device::run() {
+void Device::run()
+{
 	assert(device_);
 	assert(session_);
 	session_->run();
 }
 
-void Device::stop() {
+void Device::stop()
+{
 	assert(session_);
 	session_->stop();
 }