libretro/beetle-pce-fast-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-pce-fast-libretro.git synced 2024-11-27 10:00:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Mednafen PSX) Gets around 'exits' caused by exception throwing on consoles -

Browse Source 
starts up TOC-based CD images now on consoles
This commit is contained in:
twinaphex 2012-11-20 22:08:57 +01:00
parent 7736523a81
commit f53ff5ec4e
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mednafen/cdrom/CDAccess_Image.cpp
View File

@ -185,7 +185,7 @@ uint32 CDAccess_Image::GetSectorCount(CDRFILE_TRACK_INFO *track)
return(0);
}
void CDAccess_Image::ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int tracknum, const char *filename, const char *binoffset, const char *msfoffset, const char *length, bool image_memcache)
bool CDAccess_Image::ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int tracknum, const char *filename, const char *binoffset, const char *msfoffset, const char *length, bool image_memcache)
{
long offset = 0; // In bytes!
long tmp_long;
@ -195,6 +195,16 @@ void CDAccess_Image::ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int t
std::string efn;
efn = MDFN_EvalFIP(base_dir, filename);
FILE *dummy = fopen(efn.c_str(), "rb");
// test if file exists - if not exit prematurely
if(dummy)
fclose(dummy);
else
return false;
track->fp = new FileStream(efn.c_str(), FileStream::MODE_READ);
if(MDFN_GetSettingB("libretro.cd_load_into_ram"))
track->fp = new MemoryStream(track->fp);
@ -204,7 +214,10 @@ void CDAccess_Image::ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int t
track->AReader = AR_Open(track->fp);
if(!track->AReader)
throw MDFN_Error(0, "TODO ERROR");
{
fprintf(stderr, "TODO ERROR.\n");
return false;
}
}
sector_mult = DI_Size_Table[track->DIFormat];
@ -250,13 +263,16 @@ void CDAccess_Image::ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int t
if(tmp_long > sectors)
{
throw MDFN_Error(0, _("Length specified in TOC file for track %d is too large by %ld sectors!\n"), tracknum, (long)(tmp_long - sectors));
fprintf(stderr, "Length specified in TOC file for track %d is too large by %ld sectors!\n", tracknum, (long)(tmp_long - sectors));
return false;
}
sectors = tmp_long;
}
track->FirstFileInstance = 1;
track->sectors = sectors;
return true;
}
@ -814,7 +830,7 @@ void CDAccess_Image::Read_Raw_Sector(uint8 *buf, int32 lba)
if(!TrackFound)
{
throw(MDFN_Error(0, _("Could not find track for sector %u!"), lba));
fprintf(stderr, "Could not find track for sector %u!\n", lba);
}
}

2
mednafen/cdrom/CDAccess_Image.h
View File

@ -60,7 +60,7 @@ class CDAccess_Image : public CDAccess
// MakeSubPQ will OR the simulated P and Q subchannel data into SubPWBuf.
void MakeSubPQ(int32 lba, uint8 *SubPWBuf);
void ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int tracknum, const char *filename, const char *binoffset, const char *msfoffset, const char *length, bool image_memcache);
bool ParseTOCFileLineInfo(CDRFILE_TRACK_INFO *track, const int tracknum, const char *filename, const char *binoffset, const char *msfoffset, const char *length, bool image_memcache);
uint32 GetSectorCount(CDRFILE_TRACK_INFO *track);
};