diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-18 10:21:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-18 10:21:23 -0500 |
| commit | dcc8abf2540ea5f19093c15566e03176bed305af (patch) | |
| tree | 8133375ed58b43b8298c692d98f0436ccfaa4c5a /src/yuzu/bootmanager.h | |
| parent | fd1ea0fd8463c65f3d266512cba04a5c9d0863da (diff) | |
| parent | f999d268f99b77e35a5f83933765de62c52d1cb1 (diff) | |
Merge pull request #9466 from german77/fix_errors
yuzu: Fix compile and setting errors
Diffstat (limited to 'src/yuzu/bootmanager.h')
| -rw-r--r-- | src/yuzu/bootmanager.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 5bbcf61f7..b24141fd9 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -242,16 +242,14 @@ private: bool first_frame = false; InputCommon::TasInput::TasState last_tas_state; +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA bool is_virtual_camera; int pending_camera_snapshots; -#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA + std::vector<u32> camera_data; 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; - std::vector<u32> camera_data; -#endif std::unique_ptr<QTimer> camera_timer; +#endif Core::System& system; |