X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fdevice.cpp;h=4edc1d10e11cbb3be3e1b5ae1e79760da47fc4cb;hp=e33d27af08d1013da9c40c4f6440cf444cdd6922;hb=2ad82c2e40b6865481733913a2c32735602f63c4;hpb=a285ce3f0cba825ac302200d1078a6bcfaf60e27 diff --git a/pv/devices/device.cpp b/pv/devices/device.cpp index e33d27a..4edc1d1 100644 --- a/pv/devices/device.cpp +++ b/pv/devices/device.cpp @@ -36,19 +36,23 @@ using Glib::Variant; namespace pv { namespace devices { -Device::Device() { +Device::Device() +{ } -Device::~Device() { +Device::~Device() +{ if (session_) session_->remove_datafeed_callbacks(); } -std::shared_ptr Device::session() const { +std::shared_ptr Device::session() const +{ return session_; } -std::shared_ptr Device::device() const { +std::shared_ptr Device::device() const +{ return device_; } @@ -76,22 +80,25 @@ T Device::read_config(const ConfigKey *key, const T default_value) (*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(); }