diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-02-06 17:38:46 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 17:38:46 +1300 |
| commit | d022913fb36854cc47bf4f8852881e1344c5afc6 (patch) | |
| tree | 501110e36b1d34337b5cba33dd1bbc5db1030100 /Source/Android/jni/MainAndroid.cpp | |
| parent | 3cc4c02c5b30d81e17bad2b5e996d3c5b029d951 (diff) | |
| parent | e07383a783848b961cee6e46276340ac4494598a (diff) | |
Merge pull request #4828 from lioncash/state
Core: Convert State enum into an enum class
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 24fabfb72a..158d63a72c 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -471,13 +471,13 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmula jobject obj) { std::lock_guard<std::mutex> guard(s_host_identity_lock); - Core::SetState(Core::CORE_RUN); + Core::SetState(Core::State::Running); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv* env, jobject obj) { std::lock_guard<std::mutex> guard(s_host_identity_lock); - Core::SetState(Core::CORE_PAUSE); + Core::SetState(Core::State::Paused); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv* env, @@ -695,10 +695,10 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetProfiling jboolean enable) { std::lock_guard<std::mutex> guard(s_host_identity_lock); - Core::SetState(Core::CORE_PAUSE); + Core::SetState(Core::State::Paused); JitInterface::ClearCache(); Profiler::g_ProfileBlocks = enable; - Core::SetState(Core::CORE_RUN); + Core::SetState(Core::State::Running); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteProfileResults(JNIEnv* env, |