From d972f39a3c20b4c8d8b8b313cdc016b3fc590ea6 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 11 Oct 2023 15:35:05 -0700 Subject: [PATCH] Minor CDvdFile correction Former-commit-id: 2c23ecd282204cbff9e8711a5d25b692d7c98425 --- include/Kyoto/CDvdFile.hpp | 2 +- src/Kyoto/DolphinCDvdFile.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Kyoto/CDvdFile.hpp b/include/Kyoto/CDvdFile.hpp index edefbb3b..f9b5db89 100644 --- a/include/Kyoto/CDvdFile.hpp +++ b/include/Kyoto/CDvdFile.hpp @@ -30,7 +30,7 @@ public: void StartARAMFileLoad(); void StallForARAMFile(); CDvdRequest* SyncRead(void* buf, uint len); - CDvdRequest* SyncSeekRead(void* buf, uint len, ESeekOrigin, int offset); + void SyncSeekRead(void* buf, uint len, ESeekOrigin, int offset); CDvdRequest* AsyncSeekRead(void* buf, uint len, ESeekOrigin, int offset); void CloseFile(); void CalcFileOffset(int offset, ESeekOrigin origin); diff --git a/src/Kyoto/DolphinCDvdFile.cpp b/src/Kyoto/DolphinCDvdFile.cpp index 1d8f7b7d..77d7f61e 100644 --- a/src/Kyoto/DolphinCDvdFile.cpp +++ b/src/Kyoto/DolphinCDvdFile.cpp @@ -224,9 +224,9 @@ CDvdFile::CDvdFile(const char* filename) CDvdFile::~CDvdFile() { CloseFile(); } -CDvdRequest* CDvdFile::SyncRead(void* dest, uint len) { AsyncSeekRead(dest, len, kSO_Cur, 0); } +CDvdRequest* CDvdFile::SyncRead(void* dest, uint len) { return AsyncSeekRead(dest, len, kSO_Cur, 0); } -CDvdRequest* CDvdFile::SyncSeekRead(void* dest, uint len, ESeekOrigin origin, int offset) { +void CDvdFile::SyncSeekRead(void* dest, uint len, ESeekOrigin origin, int offset) { StallForARAMFile(); CalcFileOffset(offset, origin);