summaryrefslogtreecommitdiffstats
path: root/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameradevicecontrol.mm')
-rw-r--r--src/plugins/avfoundation/camera/avfcameradevicecontrol.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm b/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
index 7e0d6fb4b..80347ed93 100644
--- a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
@@ -58,25 +58,25 @@ int AVFCameraDeviceControl::deviceCount() const
QString AVFCameraDeviceControl::deviceName(int index) const
{
- const QList<QByteArray> &devices = AVFCameraSession::availableCameraDevices();
+ const QList<AVFCameraInfo> &devices = AVFCameraSession::availableCameraDevices();
if (index < 0 || index >= devices.count())
return QString();
- return QString::fromUtf8(devices.at(index));
+ return QString::fromUtf8(devices.at(index).deviceId);
}
QString AVFCameraDeviceControl::deviceDescription(int index) const
{
- const QList<QByteArray> &devices = AVFCameraSession::availableCameraDevices();
+ const QList<AVFCameraInfo> &devices = AVFCameraSession::availableCameraDevices();
if (index < 0 || index >= devices.count())
return QString();
- return AVFCameraSession::cameraDeviceInfo(devices.at(index)).description;
+ return devices.at(index).description;
}
int AVFCameraDeviceControl::defaultDevice() const
{
- return AVFCameraSession::availableCameraDevices().indexOf(AVFCameraSession::defaultCameraDevice());
+ return AVFCameraSession::defaultCameraIndex();
}
int AVFCameraDeviceControl::selectedDevice() const