diff options
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.java | 5 | ||||
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.java index cc190eb7f..2a2b0f68b 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.java | |||
| @@ -195,11 +195,10 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C | |||
| 195 | { | 195 | { |
| 196 | final double[] perfStats = NativeLibrary.GetPerfStats(); | 196 | final double[] perfStats = NativeLibrary.GetPerfStats(); |
| 197 | if (perfStats[FPS] > 0) { | 197 | if (perfStats[FPS] > 0) { |
| 198 | mPerfStats.setText(String.format("FPS: %d Speed: %d%%", (int) (perfStats[FPS]), | 198 | mPerfStats.setText(String.format("FPS: %.1f", perfStats[FPS])); |
| 199 | (int) (perfStats[SPEED] * 100.0))); | ||
| 200 | } | 199 | } |
| 201 | 200 | ||
| 202 | perfStatsUpdateHandler.postDelayed(perfStatsUpdater, 3000); | 201 | perfStatsUpdateHandler.postDelayed(perfStatsUpdater, 100); |
| 203 | }; | 202 | }; |
| 204 | perfStatsUpdateHandler.post(perfStatsUpdater); | 203 | perfStatsUpdateHandler.post(perfStatsUpdater); |
| 205 | 204 | ||
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index a8f3d135e..2413a78f0 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp | |||
| @@ -198,7 +198,7 @@ public: | |||
| 198 | while (true) { | 198 | while (true) { |
| 199 | { | 199 | { |
| 200 | std::unique_lock lock(m_mutex); | 200 | std::unique_lock lock(m_mutex); |
| 201 | if (m_cv.wait_for(lock, std::chrono::milliseconds(100), | 201 | if (m_cv.wait_for(lock, std::chrono::milliseconds(800), |
| 202 | [&]() { return !m_is_running; })) { | 202 | [&]() { return !m_is_running; })) { |
| 203 | // Emulation halted. | 203 | // Emulation halted. |
| 204 | break; | 204 | break; |