IDvdRequest is fake, remove it

Former-commit-id: 7c47499116
This commit is contained in:
2023-01-29 14:16:26 -08:00
parent fb4b103879
commit f33395b657
8 changed files with 172 additions and 32 deletions

View File

@@ -2,8 +2,15 @@
#define _CDVDFILE
#include "types.h"
#include "Kyoto/CDvdRequest.hpp"
#include "Kyoto/IDvdRequest.hpp"
#include "rstl/string.hpp"
enum ESeekOrigin {
kSO_Set,
kSO_Cur,
kSO_End
};
struct DVDFileInfo;
class CDvdFile {
@@ -11,20 +18,35 @@ public:
CDvdFile(const char* name);
~CDvdFile();
uint Length() { return x14_size; }
IDvdRequest* SyncRead(void* buf, uint len);
static bool FileExists(const char*);
static void DVDARAMXferCallback(long, DVDFileInfo*);
static void ARAMARAMXferCallback(u32 addr);
void HandleDVDInterrupt();
void HandleARAMInterrupt();
void PingARAMTransfer();
void TryARAMFile();
void PushARAMFileLoad();
void PopARAMFileLoad();
void StartARAMFileLoad();
void StallForARAMFile();
CDvdRequest* SyncRead(void* buf, uint len);
CDvdRequest* 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);
void UpdateFilePos(int pos);
const int GetFileSize() const { return x14_size; }
static bool FileExists(const char*);
static void DVDARAMXferCallback(long, DVDFileInfo*);
static void ARAMARAMXferCallback(u32 addr);
static void internalCallback(s32, DVDFileInfo*);
private:
uchar pad[0x14];
uint x14_size;
uchar pad2[0x10];
int x0_fileEntry;
void* x4_;
uchar x8_;
uchar x9_;
int xc_;
int x10_offset;
int x14_size;
rstl::string x18_filename;
};
CHECK_SIZEOF(CDvdFile, 0x28)