summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authort895 <clombardo169@gmail.com>2024-01-24 12:34:50 -0500
committert895 <clombardo169@gmail.com>2024-01-25 12:53:49 -0500
commit97ca160b08537314ca6ba953a382aebda3da06b9 (patch)
tree53282078af75ecba5ad87c5bcd3ea1cdb14f0249 /src/android
parent1a3fc3724aa2d38e717a8dcbfcc6c8a808a693b6 (diff)
frontend_common: Consistently use references
Was swapping between references and pointers for no reason. Just unify them here since each of these utility functions will need their parameters to be alive.
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/jni/native.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 963f57380..4c3644cc5 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -463,8 +463,8 @@ int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject
};
return static_cast<int>(
- ContentManager::InstallNSP(&EmulationSession::GetInstance().System(),
- EmulationSession::GetInstance().System().GetFilesystem().get(),
+ ContentManager::InstallNSP(EmulationSession::GetInstance().System(),
+ *EmulationSession::GetInstance().System().GetFilesystem(),
GetJString(env, j_file), callback));
}
@@ -819,7 +819,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job
void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
jstring jprogramId) {
auto program_id = EmulationSession::GetProgramId(env, jprogramId);
- ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id);
+ ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id);
}
void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
@@ -829,8 +829,9 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
program_id, GetJString(env, jname));
}
-jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj,
- jobject jcallback) {
+jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env,
+ jobject jobj,
+ jobject jcallback) {
auto jlambdaClass = env->GetObjectClass(jcallback);
auto jlambdaInvokeMethod = env->GetMethodID(
jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
@@ -842,7 +843,7 @@ jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* en
auto& session = EmulationSession::GetInstance();
std::vector<std::string> result = ContentManager::VerifyInstalledContents(
- &session.System(), session.GetContentProvider(), callback);
+ session.System(), *session.GetContentProvider(), callback);
jobjectArray jresult =
env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
for (size_t i = 0; i < result.size(); ++i) {
@@ -863,7 +864,7 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobje
};
auto& session = EmulationSession::GetInstance();
return static_cast<jint>(
- ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback));
+ ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback));
}
jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,