MainBar: Replaced device selector combo-box with a split button

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a7dd773666fba9aec90f861dacc2f4935499859b..dc9e7de5be8589ce8f0f23244bbc7fae03c36ae9 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -438,23 +438,7 @@ void MainWindow::session_error(
 
 void MainWindow::update_device_list()
 {
-       assert(main_bar_);
-
-       shared_ptr<Device> selected_device = session_.device();
-       list< shared_ptr<Device> > devices;
-
-       if (device_manager_.devices().size() == 0)
-               return;
-
-       std::copy(device_manager_.devices().begin(),
-               device_manager_.devices().end(), std::back_inserter(devices));
-
-       if (std::find(devices.begin(), devices.end(), selected_device) ==
-               devices.end())
-               devices.push_back(selected_device);
-       assert(selected_device);
-
-       main_bar_->set_device_list(devices, selected_device);
+       main_bar_->update_device_list();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)