X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevices%2Fdevice.cpp;h=de489bc2a6f292c909b5156c4b9676f0fd8a0d08;hb=12ea3616767553ee0a615f14bbcb8ec614589e34;hp=e33d27af08d1013da9c40c4f6440cf444cdd6922;hpb=a285ce3f0cba825ac302200d1078a6bcfaf60e27;p=pulseview.git
diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp
index e33d27a..de489bc 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 .
*/
#include
@@ -26,8 +25,10 @@
using std::map;
using std::set;
+using std::shared_ptr;
using sigrok::ConfigKey;
+using sigrok::Capability;
using sigrok::Error;
using Glib::VariantBase;
@@ -36,19 +37,19 @@ using Glib::Variant;
namespace pv {
namespace devices {
-Device::Device() {
-}
-
-Device::~Device() {
+Device::~Device()
+{
if (session_)
session_->remove_datafeed_callbacks();
}
-std::shared_ptr Device::session() const {
+shared_ptr Device::session() const
+{
return session_;
}
-std::shared_ptr Device::device() const {
+shared_ptr Device::device() const
+{
return device_;
}
@@ -60,38 +61,32 @@ template
T Device::read_config(const ConfigKey *key, const T default_value)
{
assert(key);
- map< const ConfigKey*, set > 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>(
+ return VariantBase::cast_dynamic>(
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();
}