mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 03:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdrom: use correct seek function

Browse Source
This commit is contained in:
Brad Parker 2019-06-29 15:39:26 -04:00
parent 11f8361d15
commit 8d2392e36c
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libretro-common/vfs/vfs_implementation.c
View File

@ -490,12 +490,24 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(
stream->size = orbisLseek(stream->fd, 0, SEEK_END); stream->size = orbisLseek(stream->fd, 0, SEEK_END);
orbisLseek(stream->fd, 0, SEEK_SET); orbisLseek(stream->fd, 0, SEEK_SET);
#else #else
retro_vfs_file_seek_internal(stream, 0, SEEK_SET); if (stream->scheme == VFS_SCHEME_CDROM)
retro_vfs_file_seek_internal(stream, 0, SEEK_END); {
retro_vfs_file_seek_cdrom(stream, 0, SEEK_SET);
retro_vfs_file_seek_cdrom(stream, 0, SEEK_END);
stream->size = retro_vfs_file_tell_impl(stream); stream->size = retro_vfs_file_tell_impl(stream);
retro_vfs_file_seek_internal(stream, 0, SEEK_SET); retro_vfs_file_seek_cdrom(stream, 0, SEEK_SET);
}
else
{
retro_vfs_file_seek_internal(stream, 0, SEEK_SET);
retro_vfs_file_seek_internal(stream, 0, SEEK_END);
stream->size = retro_vfs_file_tell_impl(stream);
retro_vfs_file_seek_internal(stream, 0, SEEK_SET);
}
#endif #endif
return stream; return stream;
@ -600,6 +612,10 @@ int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream)
if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0) if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
{ {
#ifdef HAVE_CDROM
if (stream->scheme == VFS_SCHEME_CDROM)
return retro_vfs_file_tell_cdrom(stream);
#endif
#ifdef ORBIS #ifdef ORBIS
int64_t ret = orbisLseek(stream->fd, 0, SEEK_CUR); int64_t ret = orbisLseek(stream->fd, 0, SEEK_CUR);
if (ret < 0) if (ret < 0)
@ -610,11 +626,6 @@ int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream)
#ifdef ATLEAST_VC2005 #ifdef ATLEAST_VC2005
return _ftelli64(stream->fp); return _ftelli64(stream->fp);
#else #else
#ifdef HAVE_CDROM
if (stream->scheme == VFS_SCHEME_CDROM)
return retro_vfs_file_tell_cdrom(stream);
else
#endif
return ftell(stream->fp); return ftell(stream->fp);
#endif #endif
#endif #endif