Extend camera caching to Qt6.

PokemonAutomation · Sep 29, 2023 · 9e7f180 · 9e7f180
1 parent 6c68ee3
commit 9e7f180
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -540,8 +540,8 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h
     Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
     Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
-    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.5.cpp
-    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.5.h
+    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp
+    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h
     Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp
     Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h
     Source/CommonFramework/VideoPipeline/CameraInfo.h

diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
@@ -19,7 +19,7 @@
 //#include "Common/Cpp/Time.h"
 //#include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/VideoPipeline/CameraOption.h"
-#include "MediaServicesQt6.5.h"
+#include "MediaServicesQt6.h"
 #include "CameraWidgetQt6.5.h"
 
 //using std::cout;

diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
@@ -16,6 +16,7 @@
 //#include "Common/Cpp/Exceptions.h"
 //#include "Common/Cpp/Time.h"
 #include "CommonFramework/VideoPipeline/CameraOption.h"
+#include "MediaServicesQt6.h"
 #include "CameraWidgetQt6.h"
 
 //using std::cout;
@@ -27,15 +28,23 @@ namespace CameraQt6QVideoSink{
 
 
 std::vector<CameraInfo> CameraBackend::get_all_cameras() const{
-    std::vector<CameraInfo> ret;
+#if 1
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+#else
     const auto cameras = QMediaDevices::videoInputs();
+#endif
+    std::vector<CameraInfo> ret;
     for (const auto& info : cameras){
         ret.emplace_back(info.id().toStdString());
     }
     return ret;
 }
 std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
+#if 1
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+#else
     const auto cameras = QMediaDevices::videoInputs();
+#endif
     for (const auto& camera : cameras){
         if (camera.id().toStdString() == info.device_name()){
             return camera.description().toStdString();

diff --git a/...oPipeline/Backends/MediaServicesQt6.5.cpp → ...deoPipeline/Backends/MediaServicesQt6.cpp b/...oPipeline/Backends/MediaServicesQt6.5.cpp → ...deoPipeline/Backends/MediaServicesQt6.cpp
@@ -5,12 +5,12 @@
  */
 
 #include <QtGlobal>
-#if QT_VERSION_MAJOR == 6 && QT_VERSION_MINOR >= 5
+#if QT_VERSION_MAJOR == 6
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Time.h"
 #include "CommonFramework/Logging/Logger.h"
-#include "MediaServicesQt6.5.h"
+#include "MediaServicesQt6.h"
 
 namespace PokemonAutomation{
 

diff --git a/...deoPipeline/Backends/MediaServicesQt6.5.h → ...VideoPipeline/Backends/MediaServicesQt6.h b/...deoPipeline/Backends/MediaServicesQt6.5.h → ...VideoPipeline/Backends/MediaServicesQt6.h