claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Enums, CHDFile] Enum readability cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2019-01-08 11:10:04 -08:00
parent e2b65b7acd
commit b0d91d11c3
2 changed files with 477 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
SabreTools.Library/Data/Enums.cs
View File

@@ -34,28 +34,40 @@
/// <summary> /// <summary>
/// Availible CHD codec formats /// Availible CHD codec formats
/// </summary> /// </summary>
public enum CHDCodecType : uint public enum CHD_CODEC : uint
{ {
CHD_CODEC_NONE = 0, NONE = 0,
// general codecs #region General Codecs
CHD_CODEC_ZLIB = 0x7a6c6962, // zlib
CHD_CODEC_LZMA = 0x6c7a6d61, // lzma
CHD_CODEC_HUFFMAN = 0x68756666, // huff
CHD_CODEC_FLAC = 0x666c6163, // flac
// general codecs with CD frontend ZLIB = 0x7a6c6962, // zlib
CHD_CODEC_CD_ZLIB = 0x63647a6c, // cdzl LZMA = 0x6c7a6d61, // lzma
CHD_CODEC_CD_LZMA = 0x63646c7a, // cdlz HUFFMAN = 0x68756666, // huff
CHD_CODEC_CD_FLAC = 0x6364666c, // cdfl FLAC = 0x666c6163, // flac
// A/V codecs #endregion
CHD_CODEC_AVHUFF = 0x61766875, // avhu
// pseudo-codecs returned by hunk_info #region General Codecs with CD Frontend
CHD_CODEC_SELF = 1, // copy of another hunk
CHD_CODEC_PARENT = 2, // copy of a parent's hunk CD_ZLIB = 0x63647a6c, // cdzl
CHD_CODEC_MINI = 3, // legacy "mini" 8-byte repeat CD_LZMA = 0x63646c7a, // cdlz
CD_FLAC = 0x6364666c, // cdfl
#endregion
#region A/V Codecs
AVHUFF = 0x61766875, // avhu
#endregion
#region Pseudo-Codecs Returned by hunk_info
SELF = 1, // copy of another hunk
PARENT = 2, // copy of a parent's hunk
MINI = 3, // legacy "mini" 8-byte repeat
#endregion
} }
/// <summary> /// <summary>
@@ -74,19 +86,17 @@
Deflated = 8, Deflated = 8,
Delfate64 = 9, Delfate64 = 9,
PKWAREDataCompressionLibrary = 10, PKWAREDataCompressionLibrary = 10,
Type11 = 11, // Reserved and unused (SHOULD NOT BE USED)
BZIP2 = 12, BZIP2 = 12,
Type13 = 13, // Reserved and unused (SHOULD NOT BE USED)
LZMA = 14, LZMA = 14,
Type15 = 15, // Reserved and unused (SHOULD NOT BE USED)
Type16 = 16, // Reserved and unused (SHOULD NOT BE USED)
Type17 = 17, // Reserved and unused (SHOULD NOT BE USED)
IBMTERSE = 18, IBMTERSE = 18,
IBMLZ77 = 19, IBMLZ77 = 19,
WavPak = 97, WavPak = 97,
PPMdVersionIRev1 = 98, PPMdVersionIRev1 = 98,
// Reserved and unused (SHOULD NOT BE USED)
Type11 = 11,
Type13 = 13,
Type15 = 15,
Type16 = 16,
Type17 = 17,
} }
/// <summary> /// <summary>

50
SabreTools.Library/FileTypes/CHDFile.cs
View File

@@ -101,7 +101,7 @@ namespace SabreTools.Library.FileTypes
private ulong m_hunkcount; // number of hunks represented private ulong m_hunkcount; // number of hunks represented
private uint m_unitbytes; // size of each unit in bytes private uint m_unitbytes; // size of each unit in bytes
private ulong m_unitcount; // number of units represented private ulong m_unitcount; // number of units represented
private CHDCodecType[] m_compression = new CHDCodecType[4]; // array of compression types used private CHD_CODEC[] m_compression = new CHD_CODEC[4]; // array of compression types used
// map information // map information
private uint m_mapentrybytes; // length of each entry in a map private uint m_mapentrybytes; // length of each entry in a map
@@ -300,14 +300,14 @@ namespace SabreTools.Library.FileTypes
// Determine compression // Determine compression
switch (m_br.ReadUInt32()) switch (m_br.ReadUInt32())
{ {
case 0: m_compression[0] = CHDCodecType.CHD_CODEC_NONE; break; case 0: m_compression[0] = CHD_CODEC.NONE; break;
case 1: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 1: m_compression[0] = CHD_CODEC.ZLIB; break;
case 2: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 2: m_compression[0] = CHD_CODEC.ZLIB; break;
case 3: m_compression[0] = CHDCodecType.CHD_CODEC_AVHUFF; break; case 3: m_compression[0] = CHD_CODEC.AVHUFF; break;
default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null; default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null;
} }
m_compression[1] = m_compression[2] = m_compression[3] = CHDCodecType.CHD_CODEC_NONE; m_compression[1] = m_compression[2] = m_compression[3] = CHD_CODEC.NONE;
m_sectorsperhunk = m_br.ReadUInt32Reverse(); m_sectorsperhunk = m_br.ReadUInt32Reverse();
m_hunkcount = m_br.ReadUInt32Reverse(); m_hunkcount = m_br.ReadUInt32Reverse();
@@ -343,14 +343,14 @@ namespace SabreTools.Library.FileTypes
// Determine compression // Determine compression
switch (m_br.ReadUInt32()) switch (m_br.ReadUInt32())
{ {
case 0: m_compression[0] = CHDCodecType.CHD_CODEC_NONE; break; case 0: m_compression[0] = CHD_CODEC.NONE; break;
case 1: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 1: m_compression[0] = CHD_CODEC.ZLIB; break;
case 2: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 2: m_compression[0] = CHD_CODEC.ZLIB; break;
case 3: m_compression[0] = CHDCodecType.CHD_CODEC_AVHUFF; break; case 3: m_compression[0] = CHD_CODEC.AVHUFF; break;
default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null; default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null;
} }
m_compression[1] = m_compression[2] = m_compression[3] = CHDCodecType.CHD_CODEC_NONE; m_compression[1] = m_compression[2] = m_compression[3] = CHD_CODEC.NONE;
m_sectorsperhunk = m_br.ReadUInt32Reverse(); m_sectorsperhunk = m_br.ReadUInt32Reverse();
m_hunkcount = m_br.ReadUInt32Reverse(); m_hunkcount = m_br.ReadUInt32Reverse();
@@ -387,14 +387,14 @@ namespace SabreTools.Library.FileTypes
// Determine compression // Determine compression
switch (m_br.ReadUInt32()) switch (m_br.ReadUInt32())
{ {
case 0: m_compression[0] = CHDCodecType.CHD_CODEC_NONE; break; case 0: m_compression[0] = CHD_CODEC.NONE; break;
case 1: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 1: m_compression[0] = CHD_CODEC.ZLIB; break;
case 2: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 2: m_compression[0] = CHD_CODEC.ZLIB; break;
case 3: m_compression[0] = CHDCodecType.CHD_CODEC_AVHUFF; break; case 3: m_compression[0] = CHD_CODEC.AVHUFF; break;
default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null; default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null;
} }
m_compression[1] = m_compression[2] = m_compression[3] = CHDCodecType.CHD_CODEC_NONE; m_compression[1] = m_compression[2] = m_compression[3] = CHD_CODEC.NONE;
m_hunkcount = m_br.ReadUInt32Reverse(); m_hunkcount = m_br.ReadUInt32Reverse();
m_logicalbytes = m_br.ReadUInt64Reverse(); m_logicalbytes = m_br.ReadUInt64Reverse();
@@ -435,14 +435,14 @@ namespace SabreTools.Library.FileTypes
// Determine compression // Determine compression
switch (m_br.ReadUInt32()) switch (m_br.ReadUInt32())
{ {
case 0: m_compression[0] = CHDCodecType.CHD_CODEC_NONE; break; case 0: m_compression[0] = CHD_CODEC.NONE; break;
case 1: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 1: m_compression[0] = CHD_CODEC.ZLIB; break;
case 2: m_compression[0] = CHDCodecType.CHD_CODEC_ZLIB; break; case 2: m_compression[0] = CHD_CODEC.ZLIB; break;
case 3: m_compression[0] = CHDCodecType.CHD_CODEC_AVHUFF; break; case 3: m_compression[0] = CHD_CODEC.AVHUFF; break;
default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null; default: /* throw CHDERR_UNKNOWN_COMPRESSION; */ return null;
} }
m_compression[1] = m_compression[2] = m_compression[3] = CHDCodecType.CHD_CODEC_NONE; m_compression[1] = m_compression[2] = m_compression[3] = CHD_CODEC.NONE;
m_hunkcount = m_br.ReadUInt32Reverse(); m_hunkcount = m_br.ReadUInt32Reverse();
m_logicalbytes = m_br.ReadUInt64Reverse(); m_logicalbytes = m_br.ReadUInt64Reverse();
@@ -473,10 +473,10 @@ namespace SabreTools.Library.FileTypes
byte[] sha1 = new byte[20]; byte[] sha1 = new byte[20];
// Determine compression // Determine compression
m_compression[0] = (CHDCodecType)m_br.ReadUInt32Reverse(); m_compression[0] = (CHD_CODEC)m_br.ReadUInt32Reverse();
m_compression[1] = (CHDCodecType)m_br.ReadUInt32Reverse(); m_compression[1] = (CHD_CODEC)m_br.ReadUInt32Reverse();
m_compression[2] = (CHDCodecType)m_br.ReadUInt32Reverse(); m_compression[2] = (CHD_CODEC)m_br.ReadUInt32Reverse();
m_compression[3] = (CHDCodecType)m_br.ReadUInt32Reverse(); m_compression[3] = (CHD_CODEC)m_br.ReadUInt32Reverse();
m_logicalbytes = m_br.ReadUInt64Reverse(); m_logicalbytes = m_br.ReadUInt64Reverse();
m_mapoffset = m_br.ReadUInt64Reverse(); m_mapoffset = m_br.ReadUInt64Reverse();