projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't try to store a reference to a shared pointer.
[pulseview.git]
/
pv
/
dialogs
/
connect.cpp
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index fcb2103bedf77737d23f1c5e48b09f4af8199ef6..4fcbf694279edd0a4a2527d4869e6e45aa93ed01 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-20,11
+20,12
@@
#include <cassert>
#include <cassert>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "connect.hpp"
#include "connect.hpp"
-#include "pv/devicemanager.hpp"
+#include <pv/devicemanager.hpp>
+#include <pv/devices/hardwaredevice.hpp>
using std::list;
using std::map;
using std::list;
using std::map;
@@
-38,7
+39,8
@@
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Driver;
using sigrok::Error;
using sigrok::ConfigKey;
using sigrok::Driver;
using sigrok::Error;
-using sigrok::HardwareDevice;
+
+using pv::devices::HardwareDevice;
namespace pv {
namespace dialogs {
namespace pv {
namespace dialogs {
@@
-167,7
+169,7
@@
void Connect::scan_pressed()
serial.toUtf8().constData());
}
serial.toUtf8().constData());
}
- list< shared_ptr<HardwareDevice> > devices =
+
const
list< shared_ptr<HardwareDevice> > devices =
device_manager_.driver_scan(driver, drvopts);
for (shared_ptr<HardwareDevice> device : devices)
device_manager_.driver_scan(driver, drvopts);
for (shared_ptr<HardwareDevice> device : devices)
@@
-175,8
+177,9
@@
void Connect::scan_pressed()
assert(device);
QString text = QString::fromStdString(
assert(device);
QString text = QString::fromStdString(
- device_manager_.get_display_name(device));
- text += QString(" with %1 channels").arg(device->channels().size());
+ device->display_name(device_manager_));
+ text += QString(" with %1 channels").arg(
+ device->device()->channels().size());
QListWidgetItem *const item = new QListWidgetItem(text,
&device_list_);
QListWidgetItem *const item = new QListWidgetItem(text,
&device_list_);