libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2024-12-13 11:35:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jpd002/Play-

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2015-06-04 00:04:25 -04:00
commit 84dae88787
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/PS2VM.cpp
View File

@ -17,6 +17,9 @@
#else
#include "Posix_VolumeStream.h"
#endif
#ifdef __ANDROID__
#include "PosixFileStream.h"
#endif
#include "stricmp.h"
#include "CsoImageStream.h"
#include "IszImageStream.h"
@ -668,6 +671,15 @@ void CPS2VM::CDROM0_Reset()
CDROM0_Mount(CAppConfig::GetInstance().GetPreferenceString(PS2VM_CDROM0PATH));
}
Framework::CStream* CPS2VM::CDROM0_CreateImageStream(const char* path)
{
#ifdef __ANDROID__
return new Framework::CPosixFileStream(path, O_RDONLY);
#else
return new Framework::CStdStream(path, "rb");
#endif
}
void CPS2VM::CDROM0_Mount(const char* path)
{
//Check if there's an m_pCDROM0 already
@ -688,11 +700,11 @@ void CPS2VM::CDROM0_Mount(const char* path)
//Gotta think of something better than that...
if(!stricmp(extension, ".isz"))
{
stream = std::make_shared<CIszImageStream>(new Framework::CStdStream(path, "rb"));
stream = std::make_shared<CIszImageStream>(CDROM0_CreateImageStream(path));
}
else if(!stricmp(extension, ".cso"))
{
stream = std::make_shared<CCsoImageStream>(new Framework::CStdStream(path, "rb"));
stream = std::make_shared<CCsoImageStream>(CDROM0_CreateImageStream(path));
}
#ifdef WIN32
else if(path[0] == '\\')
@ -717,7 +729,7 @@ void CPS2VM::CDROM0_Mount(const char* path)
//If it's null after all that, just feed it to a StdStream
if(!stream)
{
stream = std::make_shared<Framework::CStdStream>(path, "rb");
stream = std::shared_ptr<Framework::CStream>(CDROM0_CreateImageStream(path));
}
try

1
Source/PS2VM.h
View File

@ -120,6 +120,7 @@ private:
void OnGsNewFrame();
void CDROM0_Initialize();
Framework::CStream* CDROM0_CreateImageStream(const char*);
void CDROM0_Mount(const char*);
void CDROM0_Reset();
void CDROM0_Destroy();