diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-04 12:43:05 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-08 09:58:15 +0200 |
| commit | 1c4dd0c23c0a7bdefaeecbae491a12f49a6b9ce5 (patch) | |
| tree | 1a8e273f5da4a4c7718a36c9d70831ab99150280 /examples/multimediawidgets/camera | |
| parent | 34d4dc092aa82adf9dc1b9e1a2f85dc474cfbc63 (diff) | |
Rename QCameraInfo/QAudioDeviceInfo to QCamera/AudioDevice
Those classes represent the physical device and it's properties, thus
that name fits best.
Change-Id: I0f45fc875ae6110452c1f2fb17f32adbe5155d01
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera')
| -rw-r--r-- | examples/multimediawidgets/camera/camera.cpp | 12 | ||||
| -rw-r--r-- | examples/multimediawidgets/camera/camera.h | 2 | ||||
| -rw-r--r-- | examples/multimediawidgets/camera/videosettings.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index a237c38de..8e339a6cb 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -56,10 +56,10 @@ #include <QMediaEncoder> #include <QVideoWidget> -#include <QCameraInfo> +#include <QCameraDevice> #include <QMediaMetaData> #include <QMediaDevices> -#include <QAudioDeviceInfo> +#include <QAudioDevice> #include <QMessageBox> #include <QPalette> @@ -89,7 +89,7 @@ Camera::Camera() setCamera(QMediaDevices::defaultVideoInput()); } -void Camera::setCamera(const QCameraInfo &cameraInfo) +void Camera::setCamera(const QCameraDevice &cameraInfo) { m_camera.reset(new QCamera(cameraInfo)); m_captureSession.setCamera(m_camera.data()); @@ -320,7 +320,7 @@ void Camera::displayCameraError() void Camera::updateCameraDevice(QAction *action) { - setCamera(qvariant_cast<QCameraInfo>(action->data())); + setCamera(qvariant_cast<QCameraDevice>(action->data())); } void Camera::displayViewfinder() @@ -362,8 +362,8 @@ void Camera::closeEvent(QCloseEvent *event) void Camera::updateCameras() { ui->menuDevices->clear(); - const QList<QCameraInfo> availableCameras = QMediaDevices::videoInputs(); - for (const QCameraInfo &cameraInfo : availableCameras) { + const QList<QCameraDevice> availableCameras = QMediaDevices::videoInputs(); + for (const QCameraDevice &cameraInfo : availableCameras) { QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup); videoDeviceAction->setCheckable(true); videoDeviceAction->setData(QVariant::fromValue(cameraInfo)); diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index 2424b57d0..95e436744 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -79,7 +79,7 @@ public slots: void saveMetaData(); private slots: - void setCamera(const QCameraInfo &cameraInfo); + void setCamera(const QCameraDevice &cameraInfo); void startCamera(); void stopCamera(); diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp index c6c0182ab..aafd4b5f3 100644 --- a/examples/multimediawidgets/camera/videosettings.cpp +++ b/examples/multimediawidgets/camera/videosettings.cpp @@ -56,9 +56,9 @@ #include <QDebug> #include <QMediaEncoder> #include <QMediaFormat> -#include <QAudioDeviceInfo> +#include <QAudioDevice> #include <QMediaCaptureSession> -#include <QCameraInfo> +#include <QCameraDevice> #include <QCamera> VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent) |