summaryrefslogtreecommitdiffhomepage
path: root/compat
diff options
context:
space:
mode:
Diffstat (limited to 'compat')
-rw-r--r--compat/camera-names.cpp8
-rw-r--r--compat/process-list.cpp11
-rw-r--r--compat/process-list.hpp4
3 files changed, 14 insertions, 9 deletions
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 <QCameraInfo>
+# include <QCameraDevice>
+# include <QMediaDevices>
#endif
#ifdef __linux__
@@ -143,9 +144,8 @@ std::vector<std::tuple<QString, int>> get_camera_names()
}
#endif
#ifdef __APPLE__
- QList<QCameraInfo> 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 <vector>
+#include <QStringList>
+#include <QDebug>
+
#ifdef _WIN32
#include <windows.h>
@@ -32,10 +36,13 @@ QStringList get_all_executable_names()
#elif defined __APPLE__
+#include <sys/sysctl.h>
+#include <libproc.h>
+
QStringList get_all_executable_names()
{
- std::vector<QString> ret; ret.reserve(512);
- std::vector<int> vec; vec.reserve(512);
+ QStringList ret; ret.reserve(512);
+ QList<int> 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 <vector>
-#include <QString>
-#include <QList>
+#include <QStringList>
OTR_COMPAT_EXPORT QStringList get_all_executable_names();