From a8a0a50af742ae6face51e98df3b9b46f629a25d Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 9 Nov 2021 12:54:07 +1000 Subject: [PATCH] ISOReader: Make fields public/accessible --- src/common/iso_reader.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/common/iso_reader.h b/src/common/iso_reader.h index 0098e18ee..21ac0f08e 100644 --- a/src/common/iso_reader.h +++ b/src/common/iso_reader.h @@ -15,16 +15,6 @@ public: SECTOR_SIZE = 2048 }; - ISOReader(); - ~ISOReader(); - - bool Open(CDImage* image, u32 track_number); - - std::vector GetFilesInDirectory(const char* path); - - bool ReadFile(const char* path, std::vector* data); - -private: #pragma pack(push, 1) struct ISOVolumeDescriptorHeader @@ -138,6 +128,20 @@ private: #pragma pack(pop) + ISOReader(); + ~ISOReader(); + + ALWAYS_INLINE const CDImage* GetImage() const { return m_image; } + ALWAYS_INLINE u32 GetTrackNumber() const { return m_track_number; } + ALWAYS_INLINE const ISOPrimaryVolumeDescriptor& GetPVD() const { return m_pvd; } + + bool Open(CDImage* image, u32 track_number); + + std::vector GetFilesInDirectory(const char* path); + + bool ReadFile(const char* path, std::vector* data); + +private: bool ReadPVD(); std::optional LocateFile(const char* path);