X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevices%2Fhardwaredevice.cpp;h=591c756ba84519abce9b2e0eed39e41f07b83763;hp=d1161aa26669a614bc36fc52e4871bdc1fb68496;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=4d6c6ea3e6b069787c270d4911083dae05eae4c6 diff --git a/pv/devices/hardwaredevice.cpp b/pv/devices/hardwaredevice.cpp index d1161aa..591c756 100644 --- a/pv/devices/hardwaredevice.cpp +++ b/pv/devices/hardwaredevice.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 @@ -44,15 +43,18 @@ namespace devices { HardwareDevice::HardwareDevice(const std::shared_ptr &context, std::shared_ptr device) : context_(context), - device_open_(false) { + device_open_(false) +{ device_ = device; } -HardwareDevice::~HardwareDevice() { +HardwareDevice::~HardwareDevice() +{ close(); } -string HardwareDevice::full_name() const { +string HardwareDevice::full_name() const +{ vector parts = {device_->vendor(), device_->model(), device_->version(), device_->serial_number()}; if (device_->connection_id().length() > 0) @@ -60,12 +62,14 @@ string HardwareDevice::full_name() const { return join(parts, " "); } -shared_ptr HardwareDevice::hardware_device() const { +shared_ptr HardwareDevice::hardware_device() const +{ return static_pointer_cast(device_); } string HardwareDevice::display_name( - const DeviceManager &device_manager) const { + const DeviceManager &device_manager) const +{ const auto hw_dev = hardware_device(); // If we can find another device with the same model/vendor then @@ -95,13 +99,14 @@ string HardwareDevice::display_name( return join(parts, " "); } -void HardwareDevice::open() { +void HardwareDevice::open() +{ if (device_open_) close(); try { device_->open(); - } catch(const sigrok::Error &e) { + } catch (const sigrok::Error &e) { throw QString(e.what()); } @@ -112,7 +117,8 @@ void HardwareDevice::open() { session_->add_device(device_); } -void HardwareDevice::close() { +void HardwareDevice::close() +{ if (device_open_) device_->close();