diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-01 18:29:59 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-01 18:53:47 +0200 |
commit | 781ab8407b50d303197ab6fb888ed35ecbcce23a (patch) | |
tree | eaf2aabd5471c13fe89ac5f7da247b3bf1248e83 /src/core/frontend | |
parent | Merge pull request #2304 from lioncash/memsize (diff) | |
download | yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar.gz yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar.bz2 yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar.lz yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar.xz yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.tar.zst yuzu-781ab8407b50d303197ab6fb888ed35ecbcce23a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/frontend/emu_window.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index e29afd630..1320bbe77 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -30,7 +30,7 @@ private: explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {} std::tuple<float, float, bool> GetStatus() const override { if (auto state = touch_state.lock()) { - std::lock_guard<std::mutex> guard(state->mutex); + std::lock_guard guard{state->mutex}; return std::make_tuple(state->touch_x, state->touch_y, state->touch_pressed); } return std::make_tuple(0.0f, 0.0f, false); @@ -81,7 +81,7 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) return; - std::lock_guard<std::mutex> guard(touch_state->mutex); + std::lock_guard guard{touch_state->mutex}; touch_state->touch_x = static_cast<float>(framebuffer_x - framebuffer_layout.screen.left) / (framebuffer_layout.screen.right - framebuffer_layout.screen.left); touch_state->touch_y = static_cast<float>(framebuffer_y - framebuffer_layout.screen.top) / @@ -91,7 +91,7 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { } void EmuWindow::TouchReleased() { - std::lock_guard<std::mutex> guard(touch_state->mutex); + std::lock_guard guard{touch_state->mutex}; touch_state->touch_pressed = false; touch_state->touch_x = 0; touch_state->touch_y = 0; |