Moved default device functionality into SigSession

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 57e9c51f8d51b647e8ea6164d61834c1d832d11a..2a74d5b292a40f8ac6ecaf42ba1dbdc791eef7a5 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -287,34 +287,19 @@ void MainWindow::session_error(
                Q_ARG(QString, info_text));
 }
 
-void MainWindow::update_device_list(
-       shared_ptr<pv::device::DevInst> selected_device)
+void MainWindow::update_device_list()
 {
        assert(_sampling_bar);
 
+       shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
        list< shared_ptr<device::DevInst> > devices;
        std::copy(_device_manager.devices().begin(),
                _device_manager.devices().end(), std::back_inserter(devices));
 
        _sampling_bar->set_device_list(devices);
 
-       if (!selected_device && !devices.empty()) {
-               // Fall back to the first device in the list.
-               selected_device = devices.front();
-
-               // Try and find the demo device and select that by default
-               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 (selected_device) {
-               // Setting the selected device in the sampling bar, generates
-               // an event which updates the selected device in the SigSession.
+       if (selected_device)
                _sampling_bar->set_selected_device(selected_device);
-       }
 }
 
 void MainWindow::load_file(QString file_name)
@@ -382,10 +367,10 @@ void MainWindow::on_actionConnect_triggered()
 
        // If the user selected a device, select it in the device list. Select the
        // current device otherwise.
-       shared_ptr<device::DevInst> dev_inst = dlg.exec() ?
-               dlg.get_selected_device() : _session.get_device();
+       if (dlg.exec())
+               _session.set_device(dlg.get_selected_device());
 
-       update_device_list(dev_inst);
+       update_device_list();
 }
 
 void MainWindow::on_actionQuit_triggered()