More DolphinCDvdFile progress, only one function remains

Former-commit-id: 76e0804ecb
This commit is contained in:
2023-02-01 00:13:54 -08:00
parent 1accd793c4
commit 17148384f2
6 changed files with 240 additions and 71 deletions

View File

@@ -1,17 +1,19 @@
#ifndef _CDVDFILE
#define _CDVDFILE
#include "types.h"
#include "Kyoto/CDvdRequest.hpp"
#include "types.h"
#include "rstl/auto_ptr.hpp"
#include "rstl/reserved_vector.hpp"
#include "rstl/single_ptr.hpp"
#include "rstl/string.hpp"
enum ESeekOrigin {
kSO_Set,
kSO_Cur,
kSO_End
};
enum ESeekOrigin { kSO_Set, kSO_Cur, kSO_End };
class CDvdFile;
struct CDvdFileARAM;
struct DVDFileInfo;
class CDvdFile {
public:
@@ -24,6 +26,7 @@ public:
void TryARAMFile();
void PushARAMFileLoad();
void PopARAMFileLoad();
bool IsARAMFileLoaded();
void StartARAMFileLoad();
void StallForARAMFile();
CDvdRequest* SyncRead(void* buf, uint len);
@@ -38,12 +41,13 @@ public:
static void DVDARAMXferCallback(long, DVDFileInfo*);
static void ARAMARAMXferCallback(u32 addr);
static void internalCallback(s32, DVDFileInfo*);
private:
int x0_fileEntry;
void* x4_;
uchar x8_;
uchar x9_;
int xc_;
uchar* x4_;
bool x8_;
bool x9_;
rstl::single_ptr< CDvdFileARAM > xc_;
int x10_offset;
int x14_size;
rstl::string x18_filename;