diff options
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/bootmanager.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 682b37f47..ffd3f0028 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -820,6 +820,7 @@ void GRenderWindow::RequestCameraCapture() { } void GRenderWindow::OnCameraCapture(int requestId, const QImage& img) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA // TODO: Capture directly in the format and resolution needed const auto converted = img.scaled(CAMERA_WIDTH, CAMERA_HEIGHT, Qt::AspectRatioMode::IgnoreAspectRatio, @@ -828,6 +829,7 @@ void GRenderWindow::OnCameraCapture(int requestId, const QImage& img) { std::memcpy(camera_data.data(), converted.bits(), CAMERA_WIDTH * CAMERA_HEIGHT * sizeof(u32)); input_subsystem->GetCamera()->SetCameraData(CAMERA_WIDTH, CAMERA_HEIGHT, camera_data); pending_camera_snapshots = 0; +#endif } bool GRenderWindow::event(QEvent* event) { diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 5bbcf61f7..514437359 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -242,16 +242,16 @@ private: bool first_frame = false; InputCommon::TasInput::TasState last_tas_state; - bool is_virtual_camera; - int pending_camera_snapshots; #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA - std::unique_ptr<QCamera> camera; - std::unique_ptr<QCameraImageCapture> camera_capture; static constexpr std::size_t CAMERA_WIDTH = 320; static constexpr std::size_t CAMERA_HEIGHT = 240; + bool is_virtual_camera; + int pending_camera_snapshots; std::vector<u32> camera_data; -#endif + std::unique_ptr<QCamera> camera; + std::unique_ptr<QCameraImageCapture> camera_capture; std::unique_ptr<QTimer> camera_timer; +#endif Core::System& system; |