thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address feedback, remove probably-misleading comment (had already fixed it).

Browse source
This commit is contained in:
Henrik Rydgård 2021-02-27 22:18:43 +01:00
parent 2364c1c5e6
commit e60b38b6cb
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
android/jni/app-android.cpp
View file

@ -246,19 +246,29 @@ int Android_OpenContentUriFd(const std::string &filename) {
return fd;
}
void Android_CloseContentUriFd(int fd) {
if (!fd) {
return;
class ContentURIFileLoader : public ProxiedFileLoader {
public:
ContentURIFileLoader(const std::string &filename)
: ProxiedFileLoader(nullptr) { // we overwrite the nullptr below
int fd = Android_OpenContentUriFd(filename);
INFO_LOG(SYSTEM, "Fd %d for content URI: '%s'", fd, filename.c_str());
backend_ = new LocalFileLoader(fd, filename);
}
}
bool ExistsFast() override {
if (!nativeActivity) {
// Assume it does if we don't have a NativeActivity right now.
return true;
}
return backend_->ExistsFast();
}
};
class AndroidContentLoaderFactory : public FileLoaderFactory {
public:
AndroidContentLoaderFactory() {}
FileLoader *ConstructFileLoader(const std::string &filename) override {
int fd = Android_OpenContentUriFd(filename);
INFO_LOG(SYSTEM, "Fd %d for content URI: '%s'", fd, filename.c_str());
return new LocalFileLoader(fd, filename);
return new ContentURIFileLoader(filename);
}
};
@ -688,7 +698,6 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_init
NativeInit((int)args.size(), &args[0], user_data_path.c_str(), externalStorageDir.c_str(), cacheDir.c_str());
std::unique_ptr<FileLoaderFactory> factory(new AndroidContentLoaderFactory());
// Register a content URI file loader.