mirror of
https://github.com/skyline-emu/skyline.git
synced 2024-11-29 11:04:17 +01:00
Improve Clean Exit + Audio Pausing + Improve System Language Setting
* Clean Exiting was improved by implementing a robust system for when to abandon clean exiting and simply restart the process alongside moving clean exiting to the background when the application is quit by using the back button * Audio is now automatically paused whenever the application is moved to the background and automatically resumed when it's brought to the foreground * The system language setting had several errors and inconsistencies which have now been fixed, it's been brought more in line with HOS language (Albeit not entirely due to no region setting in Skyline) * Fix a bug with `ThreadLocal` where the atomic `list` pointer was uninitialized resulting in a `SEGFAULT` during the destructor
This commit is contained in:
PixelyIon
parent
a7548c79a0
commit
bbf28d1942
208
app/libraries/vklayers/LICENSE.libVkLayer_khronos_validation.txt
Normal file
208
app/libraries/vklayers/LICENSE.libVkLayer_khronos_validation.txt
Normal file
@ -0,0 +1,208 @@
|
||||
The majority of files in this project use the Apache 2.0 License.
|
||||
There are a few exceptions and their license can be found in the source.
|
||||
Any license deviations from Apache 2.0 are "more permissive" licenses.
|
||||
Any file without a license in it's source defaults to the repository Apache 2.0 License.
|
||||
|
||||
===========================================================================================
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
@ -17,6 +17,7 @@
|
||||
#include "skyline/os.h"
|
||||
#include "skyline/jvm.h"
|
||||
#include "skyline/gpu.h"
|
||||
#include "skyline/audio.h"
|
||||
#include "skyline/input.h"
|
||||
#include "skyline/kernel/types/KProcess.h"
|
||||
|
||||
@ -26,6 +27,7 @@ jfloat AverageFrametimeDeviationMs; //!< The average deviation of the average fr
|
||||
|
||||
std::weak_ptr<skyline::kernel::OS> OsWeak;
|
||||
std::weak_ptr<skyline::gpu::GPU> GpuWeak;
|
||||
std::weak_ptr<skyline::audio::Audio> AudioWeak;
|
||||
std::weak_ptr<skyline::input::Input> InputWeak;
|
||||
|
||||
// https://cs.android.com/android/platform/superproject/+/master:bionic/libc/tzcode/bionic.cpp;l=43;drc=master;bpv=1;bpt=1
|
||||
@ -86,16 +88,17 @@ extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication(
|
||||
|
||||
try {
|
||||
auto os{std::make_shared<skyline::kernel::OS>(
|
||||
jvmManager,
|
||||
logger,
|
||||
settings,
|
||||
std::string(appFilesPath),
|
||||
GetTimeZoneName(),
|
||||
static_cast<skyline::language::SystemLanguage>(systemLanguage),
|
||||
std::make_shared<skyline::vfs::AndroidAssetFileSystem>(AAssetManager_fromJava(env, assetManager))
|
||||
)};
|
||||
jvmManager,
|
||||
logger,
|
||||
settings,
|
||||
std::string(appFilesPath),
|
||||
GetTimeZoneName(),
|
||||
static_cast<skyline::language::SystemLanguage>(systemLanguage),
|
||||
std::make_shared<skyline::vfs::AndroidAssetFileSystem>(AAssetManager_fromJava(env, assetManager))
|
||||
)};
|
||||
OsWeak = os;
|
||||
GpuWeak = os->state.gpu;
|
||||
AudioWeak = os->state.audio;
|
||||
InputWeak = os->state.input;
|
||||
jvmManager->InitializeControllers();
|
||||
env->ReleaseStringUTFChars(appFilesPathJstring, appFilesPath);
|
||||
@ -125,14 +128,14 @@ extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_executeApplication(
|
||||
close(romFd);
|
||||
}
|
||||
|
||||
extern "C" JNIEXPORT jboolean Java_emu_skyline_EmulationActivity_stopEmulation(JNIEnv *, jobject) {
|
||||
extern "C" JNIEXPORT jboolean Java_emu_skyline_EmulationActivity_stopEmulation(JNIEnv *, jobject, jboolean join) {
|
||||
auto os{OsWeak.lock()};
|
||||
if (!os)
|
||||
return false;
|
||||
auto process{os->state.process};
|
||||
if (!process)
|
||||
return false;
|
||||
process->Kill(true, false, true);
|
||||
process->Kill(join, false, true);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -144,6 +147,15 @@ extern "C" JNIEXPORT jboolean Java_emu_skyline_EmulationActivity_setSurface(JNIE
|
||||
return true;
|
||||
}
|
||||
|
||||
extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_changeAudioStatus(JNIEnv *, jobject, jboolean play) {
|
||||
auto audio{AudioWeak.lock()};
|
||||
if (audio)
|
||||
if (play)
|
||||
audio->Resume();
|
||||
else
|
||||
audio->Pause();
|
||||
}
|
||||
|
||||
extern "C" JNIEXPORT void Java_emu_skyline_EmulationActivity_updatePerformanceStatistics(JNIEnv *env, jobject thiz) {
|
||||
static jclass clazz{};
|
||||
if (!clazz)
|
||||
|
||||
@ -21,6 +21,14 @@ namespace skyline::audio {
|
||||
|
||||
~Audio();
|
||||
|
||||
void Pause() {
|
||||
outputStream->requestPause();
|
||||
}
|
||||
|
||||
void Resume() {
|
||||
outputStream->requestStart();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Opens a new track that can be used to play sound
|
||||
* @param channelCount The amount channels that are present in the track
|
||||
|
||||
@ -20,25 +20,25 @@ namespace skyline {
|
||||
* @brief The list of all languages. Entries parameters are language, language code, system language index, application language index and map which holds a macro used for filtering some application languages that don't have a direct corresponding system language
|
||||
* @example #define LANG_ENTRY(lang, code, sysIndex, appIndex, map) func(lang, code, sysIndex, appIndex, map) <br> LANGUAGES <br> #undef LANG_ENTRY
|
||||
*/
|
||||
#define LANGUAGES \
|
||||
LANG_ENTRY(Japanese, ja, 0, 2, MAP) \
|
||||
LANG_ENTRY(AmericanEnglish, en-us, 1, 0, MAP) \
|
||||
LANG_ENTRY(French, fr, 2, 3, MAP) \
|
||||
LANG_ENTRY(German, de, 3, 4, MAP) \
|
||||
LANG_ENTRY(Italian, it, 4, 7, MAP) \
|
||||
LANG_ENTRY(Spanish, es, 5, 6, MAP) \
|
||||
LANG_ENTRY(Chinese, zh-CN, 6, 14, DONT_MAP) \
|
||||
LANG_ENTRY(Korean, ko, 7, 12, MAP) \
|
||||
LANG_ENTRY(Dutch, nl, 8, 8, MAP) \
|
||||
LANG_ENTRY(Portuguese, pt, 9, 10, MAP) \
|
||||
LANG_ENTRY(Russian, ru, 10, 11, MAP) \
|
||||
LANG_ENTRY(Taiwanese, zh-TW, 11, 13, DONT_MAP) \
|
||||
LANG_ENTRY(BritishEnglish, en-GB, 12, 1, MAP) \
|
||||
LANG_ENTRY(CanadianFrench, fr-CA, 13, 9, MAP) \
|
||||
LANG_ENTRY(LatinAmericanSpanish, es-419, 14, 5, MAP) \
|
||||
LANG_ENTRY(SimplifiedChinese, zh-Hans, 15, 14, MAP) \
|
||||
LANG_ENTRY(TraditionalChinese, zh-Hant, 16, 13, MAP) \
|
||||
LANG_ENTRY(BrazilianPortuguese, pt-BR, 17, 10, DONT_MAP)
|
||||
#define LANGUAGES \
|
||||
LANG_ENTRY(Japanese, ja, 0, 2, MAP) \
|
||||
LANG_ENTRY(AmericanEnglish, en-us, 1, 0, MAP) \
|
||||
LANG_ENTRY(French, fr, 2, 3, MAP) \
|
||||
LANG_ENTRY(German, de, 3, 4, MAP) \
|
||||
LANG_ENTRY(Italian, it, 4, 7, MAP) \
|
||||
LANG_ENTRY(Spanish, es, 5, 6, MAP) \
|
||||
LANG_ENTRY(Chinese, zh-CN, 6, 14, DONT_MAP) \
|
||||
LANG_ENTRY(Korean, ko, 7, 12, MAP) \
|
||||
LANG_ENTRY(Dutch, nl, 8, 8, MAP) \
|
||||
LANG_ENTRY(Portuguese, pt, 9, 10, MAP) \
|
||||
LANG_ENTRY(Russian, ru, 10, 11, MAP) \
|
||||
LANG_ENTRY(Taiwanese, zh-TW, 11, 13, DONT_MAP) \
|
||||
LANG_ENTRY(BritishEnglish, en-GB, 12, 1, MAP) \
|
||||
LANG_ENTRY(CanadianFrench, fr-CA, 13, 9, MAP) \
|
||||
LANG_ENTRY(LatinAmericanSpanish, es-419, 14, 5, MAP) \
|
||||
LANG_ENTRY(SimplifiedChinese, zh-Hans, 15, 14, MAP) \
|
||||
LANG_ENTRY(TraditionalChinese, zh-Hant, 16, 13, MAP) \
|
||||
LANG_ENTRY(BrazilianPortuguese, pt-BR, 17, 10, DONT_MAP)
|
||||
|
||||
/**
|
||||
* @brief Enumeration of system languages
|
||||
|
||||
@ -80,7 +80,7 @@ namespace skyline {
|
||||
|
||||
pthread_key_t key;
|
||||
std::function<IntrustiveTypeNode *(ThreadLocal &)> constructor;
|
||||
std::atomic<IntrustiveTypeNode *> list; //!< An atomic instrusive linked list of all instances of the object to call non-trivial destructors for the objects
|
||||
std::atomic<IntrustiveTypeNode *> list{}; //!< An atomic instrusive linked list of all instances of the object to call non-trivial destructors for the objects
|
||||
|
||||
public:
|
||||
template<typename... Args>
|
||||
|
||||
@ -101,9 +101,9 @@ namespace skyline::kernel::type {
|
||||
|
||||
if (mmap(guest.ptr, guest.size, UnborrowPermission.Get(), MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0) == MAP_FAILED)
|
||||
// It is likely that these exceptions will end up as asserts as the destructor is implicitly noexcept but we want to be notified about these not working so that's fine as it can be discovered in the debugger
|
||||
throw exception("An error occurred while remapping transfer memory as anonymous memory in guest: {}", strerror(errno));
|
||||
state.logger->Warn("An error occurred while remapping transfer memory as anonymous memory in guest: {}", strerror(errno));
|
||||
else if (!host.Valid())
|
||||
throw exception("Expected host mapping of transfer memory to be valid during KTransferMemory destruction");
|
||||
state.logger->Warn("Expected host mapping of transfer memory to be valid during KTransferMemory destruction");
|
||||
|
||||
std::memcpy(guest.ptr, host.ptr, host.size);
|
||||
|
||||
|
||||
@ -89,6 +89,32 @@ namespace skyline::nce {
|
||||
|
||||
*tls = nullptr;
|
||||
} else { // If TLS wasn't restored then this occurred in host code
|
||||
if (signal == SIGSEGV) {
|
||||
static bool RunningUnderDebugger{[]() {
|
||||
std::ifstream status("/proc/self/status");
|
||||
constexpr std::string_view TracerPidTag = "TracerPid:";
|
||||
|
||||
for (std::string line; std::getline(status, line); ) {
|
||||
if (line.starts_with(TracerPidTag)) {
|
||||
line = line.substr(TracerPidTag.size());
|
||||
|
||||
for (char character : line)
|
||||
if (std::isspace(character))
|
||||
continue;
|
||||
else
|
||||
return character != '0';
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}()};
|
||||
|
||||
if (RunningUnderDebugger)
|
||||
raise(SIGTRAP); // Notify the debugger if we've got a SIGSEGV as the debugger doesn't catch them by default as they might be hooked
|
||||
}
|
||||
|
||||
signal::ExceptionalSignalHandler(signal, info, ctx); //!< Delegate throwing a host exception to the exceptional signal handler
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
// SPDX-License-Identifier: MPL-2.0
|
||||
// Copyright © 2021 Skyline Team and Contributors (https://github.com/skyline-emu/)
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <soc.h>
|
||||
#include <soc/gm20b/channel.h>
|
||||
#include "gpfifo.h"
|
||||
|
||||
@ -29,6 +29,12 @@ import kotlin.math.abs
|
||||
class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTouchListener {
|
||||
companion object {
|
||||
private val Tag = EmulationActivity::class.java.simpleName
|
||||
val ReturnToMainTag = "returnToMain"
|
||||
|
||||
/**
|
||||
* The Kotlin thread on which emulation code executes
|
||||
*/
|
||||
private var emulationThread : Thread? = null
|
||||
}
|
||||
|
||||
init {
|
||||
@ -43,15 +49,15 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
private var vibrators = HashMap<Int, Vibrator>()
|
||||
|
||||
/**
|
||||
* A boolean flag denoting if the emulation thread should call finish() or not
|
||||
* If the emulation thread should call [returnToMain] or not
|
||||
*/
|
||||
@Volatile
|
||||
private var shouldFinish : Boolean = true
|
||||
|
||||
/**
|
||||
* The Kotlin thread on which emulation code executes
|
||||
* If the activity should return to [MainActivity] or just call [finishAndRemoveTask]
|
||||
*/
|
||||
private lateinit var emulationThread : Thread
|
||||
var returnToMain : Boolean = false
|
||||
|
||||
@Inject
|
||||
lateinit var settings : Settings
|
||||
@ -72,9 +78,10 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
private external fun executeApplication(romUri : String, romType : Int, romFd : Int, preferenceFd : Int, language : Int, appFilesPath : String, assetManager : AssetManager)
|
||||
|
||||
/**
|
||||
* @return If it successfully caused the [emulationThread] to gracefully stop
|
||||
* @param join If the function should only return after all the threads join or immediately
|
||||
* @return If it successfully caused [emulationThread] to gracefully stop or do so asynchronously when not joined
|
||||
*/
|
||||
private external fun stopEmulation() : Boolean
|
||||
private external fun stopEmulation(join : Boolean) : Boolean
|
||||
|
||||
/**
|
||||
* This sets the surface object in libskyline to the provided value, emulation is halted if set to null
|
||||
@ -84,12 +91,17 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
*/
|
||||
private external fun setSurface(surface : Surface?) : Boolean
|
||||
|
||||
/**
|
||||
* @param play If the audio should be playing or be stopped till it is resumed by calling this again
|
||||
*/
|
||||
private external fun changeAudioStatus(play : Boolean)
|
||||
|
||||
var fps : Int = 0
|
||||
var averageFrametime : Float = 0.0f
|
||||
var averageFrametimeDeviation : Float = 0.0f
|
||||
|
||||
/**
|
||||
* Writes the current performance statistics into [fps] and [frametime] fields
|
||||
* Writes the current performance statistics into [fps], [averageFrametime] and [averageFrametimeDeviation] fields
|
||||
*/
|
||||
private external fun updatePerformanceStatistics()
|
||||
|
||||
@ -162,25 +174,55 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
}
|
||||
|
||||
/**
|
||||
* This executes the specified ROM
|
||||
*
|
||||
* @param rom The URI of the ROM to execute
|
||||
* Return from emulation to either [MainActivity] or the activity on the back stack
|
||||
*/
|
||||
private fun executeApplication(rom : Uri) {
|
||||
fun returnFromEmulation() {
|
||||
if (shouldFinish) {
|
||||
runOnUiThread {
|
||||
if (shouldFinish) {
|
||||
shouldFinish = false
|
||||
if (returnToMain)
|
||||
startActivity(Intent(applicationContext, MainActivity::class.java).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP))
|
||||
finishAndRemoveTask()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @note Any caller has to handle the application potentially being restarted with the supplied intent
|
||||
*/
|
||||
private fun executeApplication(intent : Intent) {
|
||||
if (emulationThread?.isAlive == true) {
|
||||
shouldFinish = false
|
||||
if (stopEmulation(false))
|
||||
emulationThread!!.join(250)
|
||||
|
||||
if (emulationThread!!.isAlive) {
|
||||
finishAndRemoveTask()
|
||||
startActivity(intent)
|
||||
Runtime.getRuntime().exit(0)
|
||||
}
|
||||
}
|
||||
|
||||
shouldFinish = true
|
||||
returnToMain = intent.getBooleanExtra(ReturnToMainTag, false)
|
||||
|
||||
val rom = intent.data!!
|
||||
val romType = getRomFormat(rom, contentResolver).ordinal
|
||||
val romFd = contentResolver.openFileDescriptor(rom, "r")!!
|
||||
val preferenceFd = ParcelFileDescriptor.open(File("${applicationInfo.dataDir}/shared_prefs/${applicationInfo.packageName}_preferences.xml"), ParcelFileDescriptor.MODE_READ_WRITE)
|
||||
|
||||
emulationThread = Thread {
|
||||
executeApplication(rom.toString(), romType, romFd.detachFd(), preferenceFd.detachFd(), settings.systemLanguage, applicationContext.filesDir.canonicalPath + "/", assets)
|
||||
if (shouldFinish)
|
||||
runOnUiThread {
|
||||
emulationThread.join()
|
||||
finish()
|
||||
}
|
||||
returnFromEmulation()
|
||||
}
|
||||
|
||||
emulationThread.start()
|
||||
emulationThread!!.start()
|
||||
}
|
||||
|
||||
override fun onBackPressed() {
|
||||
returnFromEmulation()
|
||||
}
|
||||
|
||||
/**
|
||||
@ -235,12 +277,20 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
setOnClickListener { binding.onScreenControllerView.isInvisible = !binding.onScreenControllerView.isInvisible }
|
||||
}
|
||||
|
||||
executeApplication(intent.data!!)
|
||||
executeApplication(intent!!)
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
super.onPause()
|
||||
|
||||
changeAudioStatus(false)
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
|
||||
changeAudioStatus(true)
|
||||
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
|
||||
@Suppress("DEPRECATION")
|
||||
window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
|
||||
@ -253,38 +303,26 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
}
|
||||
|
||||
/**
|
||||
* This is used to stop the currently executing ROM and replace it with the one specified in the new intent
|
||||
* Stop the currently executing ROM and replace it with the one specified in the new intent
|
||||
*/
|
||||
override fun onNewIntent(intent : Intent?) {
|
||||
super.onNewIntent(intent)
|
||||
shouldFinish = false
|
||||
|
||||
while (emulationThread.isAlive)
|
||||
if (stopEmulation())
|
||||
emulationThread.join()
|
||||
|
||||
vibrators.forEach { (_, vibrator) -> vibrator.cancel() }
|
||||
|
||||
shouldFinish = true
|
||||
|
||||
executeApplication(intent?.data!!)
|
||||
super.onNewIntent(intent!!)
|
||||
setIntent(intent)
|
||||
executeApplication(intent)
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
super.onDestroy()
|
||||
shouldFinish = false
|
||||
|
||||
while (emulationThread.isAlive)
|
||||
if (stopEmulation())
|
||||
emulationThread.join()
|
||||
|
||||
stopEmulation(false)
|
||||
vibrators.forEach { (_, vibrator) -> vibrator.cancel() }
|
||||
vibrators.clear()
|
||||
}
|
||||
|
||||
override fun surfaceCreated(holder : SurfaceHolder) {
|
||||
Log.d(Tag, "surfaceCreated Holder: $holder")
|
||||
while (emulationThread.isAlive)
|
||||
while (emulationThread!!.isAlive)
|
||||
if (setSurface(holder.surface))
|
||||
return
|
||||
}
|
||||
@ -298,7 +336,7 @@ class EmulationActivity : AppCompatActivity(), SurfaceHolder.Callback, View.OnTo
|
||||
|
||||
override fun surfaceDestroyed(holder : SurfaceHolder) {
|
||||
Log.d(Tag, "surfaceDestroyed Holder: $holder")
|
||||
while (emulationThread.isAlive)
|
||||
while (emulationThread!!.isAlive)
|
||||
if (setSurface(null))
|
||||
return
|
||||
}
|
||||
|
||||
@ -278,10 +278,11 @@ class MainActivity : AppCompatActivity() {
|
||||
private fun selectStartGame(appItem : AppItem) {
|
||||
if (binding.swipeRefreshLayout.isRefreshing) return
|
||||
|
||||
if (settings.selectAction)
|
||||
if (settings.selectAction) {
|
||||
AppDialog.newInstance(appItem).show(supportFragmentManager, "game")
|
||||
else if (appItem.loaderResult == LoaderResult.Success)
|
||||
startActivity(Intent(this, EmulationActivity::class.java).apply { data = appItem.uri })
|
||||
} else if (appItem.loaderResult == LoaderResult.Success) {
|
||||
startActivity(Intent(this, EmulationActivity::class.java).apply { data = appItem.uri; putExtra(EmulationActivity.ReturnToMainTag, true) })
|
||||
}
|
||||
}
|
||||
|
||||
private fun selectShowGameDialog(appItem : AppItem) {
|
||||
|
||||
@ -13,7 +13,7 @@ import androidx.preference.EditTextPreference
|
||||
import emu.skyline.R
|
||||
|
||||
/**
|
||||
* This class adapts [EditTextPreference] so that it supports setting the value as the summary automatically. Also added useful attributes.
|
||||
* This class adapts [EditTextPreference] so that it supports setting the value as the summary automatically and adds useful attributes
|
||||
*/
|
||||
class CustomEditTextPreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = androidx.preference.R.attr.editTextPreferenceStyle) : EditTextPreference(context, attrs, defStyleAttr) {
|
||||
init {
|
||||
|
||||
@ -35,23 +35,43 @@
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
<string-array name="system_languages">
|
||||
<item>Japanese (日本語)</item>
|
||||
<item>English</item>
|
||||
<item>French (français)</item>
|
||||
<item>German (Deutsch)</item>
|
||||
<item>Italian (italiano)</item>
|
||||
<item>Spanish (español)</item>
|
||||
<item>Chinese</item>
|
||||
<item>Korean (한국어)</item>
|
||||
<item>Dutch (Nederlands)</item>
|
||||
<item>Portuguese (português)</item>
|
||||
<item>Russian (Русский)</item>
|
||||
<item>Taiwanese</item>
|
||||
<item>American English</item>
|
||||
<item>British English</item>
|
||||
<item>Canadian English</item>
|
||||
<item>Latin American Spanish</item>
|
||||
<item>Simplified Chinese</item>
|
||||
<item>Traditional Chinese (正體中文)</item>
|
||||
<item>Brazilian Portuguese (português do Brasil)</item>
|
||||
<item>Français (French)</item>
|
||||
<item>Français Canadien (Canadian French)</item>
|
||||
<item>Deutsch (German)</item>
|
||||
<item>Español (Spanish)</item>
|
||||
<item>Español Latinoamericano (Latin American Spanish)</item>
|
||||
<item>Italiano (Italian)</item>
|
||||
<item>Nederlands (Dutch)</item>
|
||||
<item>Português (Portuguese)</item>
|
||||
<item>Português do Brasil (Brazilian Portuguese)</item>
|
||||
<item>Русский (Russian)</item>
|
||||
<item>日本語 (Japanese)</item>
|
||||
<item>汉语 (Chinese)</item>
|
||||
<item>繁體中文 (Traditional Chinese)</item>
|
||||
<item>简体中文 (Simplified Chinese)</item>
|
||||
<item>한국어 (Korean)</item>
|
||||
<item>臺語 (Taiwanese)</item>
|
||||
</string-array>
|
||||
<integer-array name="system_languages_val">
|
||||
<item>1</item>
|
||||
<item>12</item>
|
||||
<item>2</item>
|
||||
<item>13</item>
|
||||
<item>3</item>
|
||||
<item>5</item>
|
||||
<item>14</item>
|
||||
<item>4</item>
|
||||
<item>8</item>
|
||||
<item>9</item>
|
||||
<item>17</item>
|
||||
<item>10</item>
|
||||
<item>0</item>
|
||||
<item>6</item>
|
||||
<item>16</item>
|
||||
<item>15</item>
|
||||
<item>7</item>
|
||||
<item>11</item>
|
||||
</integer-array>
|
||||
</resources>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
<style name="AppTheme" parent="BaseAppTheme">
|
||||
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
|
||||
<item name="android:windowLightStatusBar">true</item>
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
|
||||
</style>
|
||||
|
||||
<style name="ToolbarTheme" parent="AppTheme">
|
||||
|
||||
@ -75,6 +75,7 @@
|
||||
<emu.skyline.preference.IntegerListPreference
|
||||
android:defaultValue="1"
|
||||
android:entries="@array/system_languages"
|
||||
android:entryValues="@array/system_languages_val"
|
||||
app:key="system_language"
|
||||
app:title="@string/system_language"
|
||||
app:refreshRequired="true"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user