Suppress a redundant call to querying camera list.

PokemonAutomation · Sep 28, 2023 · 39bc426 · 39bc426
1 parent 3dbe9f5
commit 39bc426
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
@@ -8,6 +8,10 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CameraImplementations.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 #if QT_VERSION_MAJOR == 5
 #include "VideoToolsQt5.h"
 #include "CameraWidgetQt5.h"
@@ -105,7 +109,10 @@ VideoBackendOption::VideoBackendOption()
 std::vector<CameraInfo> get_all_cameras(){
     size_t index = GlobalSettings::instance().VIDEO_BACKEND.current_value();
     const CameraBackend& backend = *CameraBackends::instance().m_backends[index].backend;
-    return backend.get_all_cameras();
+//    cout << "Querying camera list..." << endl;
+    std::vector<CameraInfo> ret = backend.get_all_cameras();
+//    cout << "Done querying camera list..." << endl;
+    return ret;
 }
 std::string get_camera_name(const CameraInfo& info){
     size_t index = GlobalSettings::instance().VIDEO_BACKEND.current_value();

diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp
@@ -45,7 +45,7 @@ CameraSelectorWidget::CameraSelectorWidget(
 
     m_camera_box = new NoWheelComboBox(this);
     camera_row->addWidget(m_camera_box, 5);
-    update_camera_list();
+//    update_camera_list();
     camera_row->addSpacing(5);
 
     m_resolution_box = new NoWheelComboBox(this);