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

rename System -> MountPoint and add convenience wrapper

Browse source
This commit is contained in:
KentuckyCompass 2013-01-11 09:43:10 -08:00
parent 9f4680a267
commit a13c2da407
2 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Core/FileSystems/MetaFileSystem.cpp
View file

@ -162,7 +162,7 @@ IFileSystem *MetaFileSystem::GetHandleOwner(u32 handle)
return 0;
}
bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpath, System **system)
bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpath, MountPoint **system)
{
std::string realpath;
@ -212,7 +212,7 @@ bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpat
void MetaFileSystem::Mount(std::string prefix, IFileSystem *system)
{
System x;
MountPoint x;
x.prefix=prefix;
x.system=system;
fileSystems.push_back(x);
@ -242,10 +242,10 @@ void MetaFileSystem::Shutdown()
u32 MetaFileSystem::OpenFile(std::string filename, FileAccess access)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(filename, of, &system))
{
return system->system->OpenFile(of, access);
return system->OpenFile(of, access);
}
else
{
@ -256,10 +256,10 @@ u32 MetaFileSystem::OpenFile(std::string filename, FileAccess access)
PSPFileInfo MetaFileSystem::GetFileInfo(std::string filename)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(filename, of, &system))
{
return system->system->GetFileInfo(of);
return system->GetFileInfo(of);
}
else
{
@ -271,9 +271,9 @@ PSPFileInfo MetaFileSystem::GetFileInfo(std::string filename)
bool MetaFileSystem::GetHostPath(const std::string &inpath, std::string &outpath)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(inpath, of, &system)) {
return system->system->GetHostPath(of, outpath);
return system->GetHostPath(of, outpath);
} else {
return false;
}
@ -282,10 +282,10 @@ bool MetaFileSystem::GetHostPath(const std::string &inpath, std::string &outpath
std::vector<PSPFileInfo> MetaFileSystem::GetDirListing(std::string path)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(path, of, &system))
{
return system->system->GetDirListing(of);
return system->GetDirListing(of);
}
else
{
@ -304,10 +304,10 @@ void MetaFileSystem::ChDir(const std::string &dir)
int curThread = __KernelGetCurThread();
std::string of;
System *system;
if (MapFilePath(dir, of, &system))
MountPoint *mountPoint;
if (MapFilePath(dir, of, &mountPoint))
{
currentDir[curThread] = system->prefix + of;
currentDir[curThread] = mountPoint->prefix + of;
//return true;
}
else
@ -322,10 +322,10 @@ void MetaFileSystem::ChDir(const std::string &dir)
bool MetaFileSystem::MkDir(const std::string &dirname)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(dirname, of, &system))
{
return system->system->MkDir(of);
return system->MkDir(of);
}
else
{
@ -336,10 +336,10 @@ bool MetaFileSystem::MkDir(const std::string &dirname)
bool MetaFileSystem::RmDir(const std::string &dirname)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(dirname, of, &system))
{
return system->system->RmDir(of);
return system->RmDir(of);
}
else
{
@ -351,10 +351,10 @@ bool MetaFileSystem::RenameFile(const std::string &from, const std::string &to)
{
std::string of;
std::string rf;
System *system;
IFileSystem *system;
if (MapFilePath(from, of, &system) && MapFilePath(to, rf, &system))
{
return system->system->RenameFile(of, rf);
return system->RenameFile(of, rf);
}
else
{
@ -365,10 +365,10 @@ bool MetaFileSystem::RenameFile(const std::string &from, const std::string &to)
bool MetaFileSystem::DeleteFile(const std::string &filename)
{
std::string of;
System *system;
IFileSystem *system;
if (MapFilePath(filename, of, &system))
{
return system->system->DeleteFile(of);
return system->DeleteFile(of);
}
else
{