diff options
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.h')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h index 9fd0b1828..4772351e6 100644 --- a/src/plugins/avfoundation/camera/avfcamerasession.h +++ b/src/plugins/avfoundation/camera/avfcamerasession.h @@ -54,6 +54,7 @@ struct AVFCameraInfo AVFCameraInfo() : position(QCamera::UnspecifiedPosition), orientation(0) { } + QByteArray deviceId; QString description; QCamera::Position position; int orientation; @@ -66,8 +67,8 @@ public: AVFCameraSession(AVFCameraService *service, QObject *parent = 0); ~AVFCameraSession(); - static const QByteArray &defaultCameraDevice(); - static const QList<QByteArray> &availableCameraDevices(); + static int defaultCameraIndex(); + static const QList<AVFCameraInfo> &availableCameraDevices(); static AVFCameraInfo cameraDeviceInfo(const QByteArray &device); void setVideoOutput(AVFCameraRendererControl *output); @@ -102,9 +103,8 @@ private: void applyImageEncoderSettings(); void applyViewfinderSettings(); - static QByteArray m_defaultCameraDevice; - static QList<QByteArray> m_cameraDevices; - static QMap<QByteArray, AVFCameraInfo> m_cameraInfo; + static int m_defaultCameraIndex; + static QList<AVFCameraInfo> m_cameraDevices; AVFCameraService *m_service; AVFCameraRendererControl *m_videoOutput; |