X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fdevice.cpp;h=4ce055965167bc842d766269ff259f8cc45454fa;hp=4edc1d10e11cbb3be3e1b5ae1e79760da47fc4cb;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=2ad82c2e40b6865481733913a2c32735602f63c4

diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp
index 4edc1d1..4ce0559 100644
--- a/pv/devices/device.cpp
+++ b/pv/devices/device.cpp
@@ -14,21 +14,25 @@
  * 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>
+#include <type_traits>
+
+#include <QApplication>
+#include <QDebug>
+#include <QString>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "device.hpp"
 
-using std::map;
-using std::set;
+using std::is_same;
+using std::shared_ptr;
 
 using sigrok::ConfigKey;
-using sigrok::Error;
+using sigrok::Capability;
 
 using Glib::VariantBase;
 using Glib::Variant;
@@ -36,52 +40,59 @@ using Glib::Variant;
 namespace pv {
 namespace devices {
 
-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_;
 }
 
-template
-uint64_t Device::read_config(const sigrok::ConfigKey*,
-	const uint64_t);
+template uint64_t Device::read_config(const sigrok::ConfigKey*, const uint64_t);
 
 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)) {
+		qWarning() << QApplication::tr("Querying config key %1 is not allowed")
+			.arg(QString::fromStdString(key->identifier()));
 		return default_value;
 	}
 
-	const auto iter = keys.find(key);
-	if (iter == keys.end() ||
-		(*iter).second.find(sigrok::GET) == (*iter).second.end())
+	VariantBase value;
+	try {
+		value = device_->config_get(key);
+	} catch (const sigrok::Error &e) {
+		qWarning() << QApplication::tr("Querying config key %1 resulted in %2")
+			.arg(QString::fromStdString(key->identifier()), e.what());
 		return default_value;
+	}
 
-	return VariantBase::cast_dynamic<Glib::Variant<guint64>>(
-		device_->config_get(ConfigKey::SAMPLERATE)).get();
+	if (is_same<T, uint32_t>::value)
+		return VariantBase::cast_dynamic<Glib::Variant<guint32>>(value).get();
+	if (is_same<T, int32_t>::value)
+		return VariantBase::cast_dynamic<Glib::Variant<gint32>>(value).get();
+	if (is_same<T, uint64_t>::value)
+		return VariantBase::cast_dynamic<Glib::Variant<guint64>>(value).get();
+	if (is_same<T, int64_t>::value)
+		return VariantBase::cast_dynamic<Glib::Variant<gint64>>(value).get();
+
+	qWarning() << QApplication::tr("Unknown type supplied when attempting to query %1")
+		.arg(QString::fromStdString(key->identifier()));
+	return default_value;
 }
 
 void Device::start()