#include "mainwindow.h"
#include "devicemanager.h"
-#include "devinst.h"
+#include "device/devinst.h"
#include "dialogs/about.h"
#include "dialogs/connect.h"
#include "dialogs/storeprogress.h"
Q_ARG(QString, info_text));
}
-void MainWindow::update_device_list(shared_ptr<pv::DevInst> selected_device)
+void MainWindow::update_device_list(
+ shared_ptr<pv::device::DevInst> selected_device)
{
assert(_sampling_bar);
- const list< shared_ptr<DevInst> > &devices = _device_manager.devices();
+ const list< shared_ptr<device::DevInst> > &devices =
+ _device_manager.devices();
_sampling_bar->set_device_list(devices);
if (!selected_device && !devices.empty()) {
selected_device = devices.front();
// Try and find the demo device and select that by default
- BOOST_FOREACH (shared_ptr<pv::DevInst> dev_inst, devices)
+ BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices)
if (strcmp(dev_inst->dev_inst()->driver->name,
"demo") == 0) {
selected_device = dev_inst;
// If the user selected a device, select it in the device list. Select the
// current device otherwise.
- shared_ptr<DevInst> dev_inst = dlg.exec() ?
+ shared_ptr<device::DevInst> dev_inst = dlg.exec() ?
dlg.get_selected_device() : _session.get_device();
update_device_list(dev_inst);