From c6f76e7240dde8bbcf40a88d6d88cf87cab616b4 Mon Sep 17 00:00:00 2001
From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com>
Date: Wed, 9 Apr 2025 16:45:30 -0400
Subject: Various JSystem work (#2383)

* JKernel and JStudio cleanup

* JMessage cleanup

* JAudio cleanup

* JASBNKParser work

* functionvalue work

* fvb work

* J2D and J3D cleanup

* steal from tww

* J2DPictureEx mostly done

* fix build
---
 include/JSystem/JKernel/JKRAramArchive.h   | 4 ++--
 include/JSystem/JKernel/JKRDvdAramRipper.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/JSystem/JKernel')

diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h
index 8ff04ebaa7..2ea5f2863b 100644
--- a/include/JSystem/JKernel/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive.h
@@ -4,7 +4,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 
 class JKRAramBlock;
-class JKRDvdFile;
+class JKRFile;
 
 /**
  * @ingroup jsystem-jkernel
@@ -31,7 +31,7 @@ private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
     /* 0x64 */ JKRAramBlock* mBlock;
-    /* 0x68 */ JKRDvdFile* mDvdFile;
+    /* 0x68 */ JKRFile* mDvdFile;
 };  // Size = 0x6C
 
 #endif /* JKRARAMARCHIVE_H */
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h
index fe12c61c39..1e0f05ac15 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper.h
+++ b/include/JSystem/JKernel/JKRDvdAramRipper.h
@@ -51,6 +51,7 @@ public:
     static bool syncAram(JKRADCommand*, int);
 
     static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; }
+    static bool isErrorRetry() { return errorRetry; }
 
     // TODO: fix type
     static JSUList<JKRADCommand> sDvdAramAsyncList;
-- 
cgit v1.2.3