From 82d5e0f796d9caa22e031df8dd2454c3989b936c Mon Sep 17 00:00:00 2001 From: Jonathan Wase Date: Sun, 10 Jan 2021 02:15:52 +0100 Subject: JKRAram and JKRAramStream (#80) * before __register_global_object * JKRThread::sThreadList, JKRHeap::sSystemHeap, etc. * cleanup and started on JKRDvdArchive * before changing JKRCompression * more JKRDvdArchive, abs, and memset * fixed JKRArchive::setExpandSize split * JKRArchive::sCurrentDirID, JKRDvdFile::sDvdList, and matching JKRDvdFile constructors * problems * merge fixes and formatting * updated clang version in clang-format-all to version 10 * Added OSPhysicalToCached and struct for global memory * remove useless __attribute__ * changed from defines and macros to const variable and function * changed FLAG_HAS to FLAG_ON * JKRAram, linking problems * fix JKRAram * remove nonmatching stuff * renamed static data * more static class members * JKRAramStream OK * formatting Co-authored-by: Julgodis <> Co-authored-by: Pheenoh --- .../JSupport/JSURandomInputStream/JSURandomInputStream.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h') diff --git a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h index 0caddd1743..b47c400a94 100644 --- a/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h +++ b/include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h @@ -1,11 +1,20 @@ #ifndef __JSURANDOMINPUTSTREAM_H__ #define __JSURANDOMINPUTSTREAM_H__ +#include "JSystem/JSupport/JSUInputStream.h" #include "dolphin/types.h" -class JSURandomInputStream { +class JSURandomInputStream : public JSUInputStream { public: - void getAvailable(void) const; + JSURandomInputStream(); + virtual ~JSURandomInputStream(); + + /* vt[3] */ virtual s32 getAvailable() const; /* override */ + /* vt[4] */ virtual s32 skip(s32); /* override */ + /* vt[5] */ virtual s32 readData() = 0; + /* vt[6] */ virtual s32 getLength() const = 0; + /* vt[7] */ virtual s32 getPosition() const = 0; + /* vt[7] */ virtual s32 seekPos() = 0; }; #endif -- cgit v1.2.3