diff options
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/AndroidCommon/AndroidCommon.h | 4 | ||||
| -rw-r--r-- | Source/Android/jni/Config/PostProcessing.cpp | 6 | ||||
| -rw-r--r-- | Source/Android/jni/GameList/GameFileCache.cpp | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.h b/Source/Android/jni/AndroidCommon/AndroidCommon.h index d4f7f0a3d1..e04180ef20 100644 --- a/Source/Android/jni/AndroidCommon/AndroidCommon.h +++ b/Source/Android/jni/AndroidCommon/AndroidCommon.h @@ -17,10 +17,6 @@ jstring ToJString(JNIEnv* env, std::string_view str); std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array); jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string_view> span); jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string> span); -inline jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector<std::string>& vector) -{ - return SpanToJStringArray(env, vector); -} template <typename T, typename F> jobjectArray SpanToJObjectArray(JNIEnv* env, std::span<const T> span, jclass clazz, F f) diff --git a/Source/Android/jni/Config/PostProcessing.cpp b/Source/Android/jni/Config/PostProcessing.cpp index ea1b9d8ad4..5576c2d314 100644 --- a/Source/Android/jni/Config/PostProcessing.cpp +++ b/Source/Android/jni/Config/PostProcessing.cpp @@ -15,20 +15,20 @@ JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getShaderList(JNIEnv* env, jclass) { - return VectorToJStringArray(env, VideoCommon::PostProcessing::GetShaderList()); + return SpanToJStringArray(env, VideoCommon::PostProcessing::GetShaderList()); } JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getAnaglyphShaderList( JNIEnv* env, jclass) { - return VectorToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList()); + return SpanToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList()); } JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getPassiveShaderList( JNIEnv* env, jclass) { - return VectorToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList()); + return SpanToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList()); } } diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp index 39dc524c65..c0a78c8cee 100644 --- a/Source/Android/jni/GameList/GameFileCache.cpp +++ b/Source/Android/jni/GameList/GameFileCache.cpp @@ -46,7 +46,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCach JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_getIsoPaths(JNIEnv* env, jclass) { - return VectorToJStringArray(env, Config::GetIsoPaths()); + return SpanToJStringArray(env, Config::GetIsoPaths()); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_setIsoPaths( |
