From d033bef1ded739c056243e673a9e3fbb6c57ef24 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 17 May 2025 08:22:13 +0200 Subject: fix build on Linux & Apple --- compat/camera-names.cpp | 8 ++++---- compat/process-list.cpp | 11 +++++++++-- compat/process-list.hpp | 4 +--- 3 files changed, 14 insertions(+), 9 deletions(-) (limited to 'compat') diff --git a/compat/camera-names.cpp b/compat/camera-names.cpp index b9511037..82776584 100644 --- a/compat/camera-names.cpp +++ b/compat/camera-names.cpp @@ -12,7 +12,8 @@ #endif #ifdef __APPLE__ -# include +# include +# include #endif #ifdef __linux__ @@ -143,9 +144,8 @@ std::vector> get_camera_names() } #endif #ifdef __APPLE__ - QList cameras = QCameraInfo::availableCameras(); - for (const QCameraInfo &cameraInfo : cameras) - ret.push_back({ cameraInfo.description(), ret.size() }); + for (const QCameraDevice& camera_info : QMediaDevices::videoInputs()) + ret.push_back({ camera_info.description(), ret.size() }); #endif return ret; diff --git a/compat/process-list.cpp b/compat/process-list.cpp index 690c9e69..34c83b06 100644 --- a/compat/process-list.cpp +++ b/compat/process-list.cpp @@ -1,5 +1,9 @@ #include "process-list.hpp" +#include +#include +#include + #ifdef _WIN32 #include @@ -32,10 +36,13 @@ QStringList get_all_executable_names() #elif defined __APPLE__ +#include +#include + QStringList get_all_executable_names() { - std::vector ret; ret.reserve(512); - std::vector vec; vec.reserve(512); + QStringList ret; ret.reserve(512); + QList vec; vec.reserve(512); while (true) { diff --git a/compat/process-list.hpp b/compat/process-list.hpp index 361efa4f..323829bf 100644 --- a/compat/process-list.hpp +++ b/compat/process-list.hpp @@ -8,8 +8,6 @@ #pragma once #include "export.hpp" -#include -#include -#include +#include OTR_COMPAT_EXPORT QStringList get_all_executable_names(); -- cgit v1.2.3