StarMirror
/
qTox
mirror of https://github.com/qTox/qTox
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(macos): update deprecated AVFoundation API 

Backported from 65ff532a54
reviewable/pr6515/r16
Anthony Bilinski 2021-06-27 11:20:17 -07:00
parent c282c6e96f
commit 484ea7ce9b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -614,6 +614,17 @@ if (NOT DEFINED ENABLE_STATUSNOTIFIER AND UNIX AND NOT APPLE)
endif()
if(AVFOUNDATION_FOUND)
# used for AVFoundation compile time deprecation check
execute_process(
COMMAND sw_vers -productVersion
OUTPUT_VARIABLE MACOS_VER
)
string(REPLACE "." ";" VERSION_LIST ${MACOS_VER})
list(GET VERSION_LIST 0 MACOS_VERSION_MAJOR)
list(GET VERSION_LIST 1 MACOS_VERSION_MINOR)
add_definitions(-DMACOS_VERSION_MAJOR=${MACOS_VERSION_MAJOR})
add_definitions(-DMACOS_VERSION_MINOR=${MACOS_VERSION_MINOR})
set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
src/platform/camera/avfoundation.mm
src/platform/camera/avfoundation.h)

8
src/platform/camera/avfoundation.mm
View File

@ -27,7 +27,15 @@ QVector<QPair<QString, QString> > avfoundation::getDeviceList()
{
QVector<QPair<QString, QString> > result;
#if MACOS_VERSION_MAJOR > 10 || (MACOS_VERSION_MAJOR == 10 && MACOS_VERSION_MINOR > 14)
AVCaptureDevice* device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
id objects[] = {device};
NSUInteger count = sizeof(objects) / sizeof(id);
NSArray* devices = [NSArray arrayWithObjects:objects count:count];
#else
NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
#endif
for (AVCaptureDevice* device in devices) {
result.append({ QString::fromNSString([device uniqueID]), QString::fromNSString([device localizedName]) });
}