New ACB waveform type for HCAs (from VGMToolbox)

hozuki · Apr 15, 2020 · 8e4624d · 8e4624d
1 parent 51f6672
commit 8e4624d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/lib/cgss_cenum.h b/src/lib/cgss_cenum.h
@@ -4,14 +4,14 @@ typedef enum _CGSS_STREAM_SEEK_ORIGIN {
     CGSS_ORIGIN_BEGIN = 0,
     CGSS_ORIGIN_CURRENT = 1,
     CGSS_ORIGIN_END = 2,
-    CGSS_ORIGIN_FORCE_DWORD = 0x7fffffff
+    _CGSS_ORIGIN_FORCE_DWORD = 0x7fffffff,
 } CGSS_STREAM_SEEK_ORIGIN;
 
 typedef enum _CGSS_HCA_CIPHER_TYPE {
     CGSS_HCA_CIPH_NO_CIPHER = 0,
     CGSS_HCA_CIPH_STATIC = 1,
     CGSS_HCA_CIPH_WITH_KEY = 56,
-    CGSS_HCA_CIPH_FORCE_DWORD = 0x7fffffff
+    _CGSS_HCA_CIPH_FORCE_DWORD = 0x7fffffff,
 } CGSS_HCA_CIPHER_TYPE;
 
 typedef enum _CGSS_UTF_COLUMN_TYPE {
@@ -27,24 +27,25 @@ typedef enum _CGSS_UTF_COLUMN_TYPE {
     CGSS_UTF_COLUMN_TYPE_R64 = 9,
     CGSS_UTF_COLUMN_TYPE_STRING = 10,
     CGSS_UTF_COLUMN_TYPE_DATA = 11,
-    CGSS_UTF_COLUMN_TYPE_MASK = 0x0f
+    CGSS_UTF_COLUMN_TYPE_MASK = 0x0f,
 } CGSS_UTF_COLUMN_TYPE;
 
 typedef enum _CGSS_UTF_COLUMN_STORAGE {
     CGSS_UTF_COLUMN_STORAGE_ZERO = 0x10,
     CGSS_UTF_COLUMN_STORAGE_CONST = 0x30,
     CGSS_UTF_COLUMN_STORAGE_PER_ROW = 0x50,
     CGSS_UTF_COLUMN_STORAGE_CONST2 = 0x70,
-    CGSS_UTF_COLUMN_STORAGE_MASK = 0xf0
+    CGSS_UTF_COLUMN_STORAGE_MASK = 0xf0,
 } CGSS_UTF_COLUMN_STORAGE;
 
 typedef enum _CGSS_ACB_WAVEFORM_ENCODE_TYPE {
     CGSS_ACB_WAVEFORM_ADX = 0,
     CGSS_ACB_WAVEFORM_HCA = 2,
+    CGSS_ACB_WAVEFORM_HCA2 = 6,
     CGSS_ACB_WAVEFORM_VAG = 7,
     CGSS_ACB_WAVEFORM_ATRAC3 = 8,
     CGSS_ACB_WAVEFORM_BCWAV = 9,
-    CGSS_ACB_WAVEFORM_NINTENDO_DSP = 13
+    CGSS_ACB_WAVEFORM_NINTENDO_DSP = 13,
 } CGSS_ACB_WAVEFORM_ENCODE_TYPE;
 
 typedef enum _CGSS_OP_RESULT {
@@ -58,7 +59,7 @@ typedef enum _CGSS_OP_RESULT {
     CGSS_OP_CHECKSUM_ERROR = -7,
     CGSS_OP_DECODE_FAILED = -8,
     CGSS_OP_INVALID_HANDLE = -9,
-    CGSS_OP_FORCE_DWORD = 0x7fffffff
+    _CGSS_OP_FORCE_DWORD = 0x7fffffff,
 } CGSS_OP_RESULT;
 
 #define CGSS_OP_SUCCEEDED(x) ((CGSS_OP_RESULT)(x) >= 0)
@@ -70,13 +71,13 @@ typedef enum _CGSS_FILE_MODE {
     CGSS_FILE_MODE_CREATE_NEW = 3,
     CGSS_FILE_MODE_OPEN_EXISTING = 4,
     CGSS_FILE_MODE_OPEN_OR_CREATE = 5,
-    CGSS_FILE_MODE_FORCE_DWORD = 0x7fffffff
+    _CGSS_FILE_MODE_FORCE_DWORD = 0x7fffffff,
 } CGSS_FILE_MODE;
 
 typedef enum _CGSS_FILE_ACCESS {
     CGSS_FILE_ACCESS_NONE = 0,
     CGSS_FILE_ACCESS_READ = 1,
     CGSS_FILE_ACCESS_WRITE = 2,
     CGSS_FILE_ACCESS_READ_WRITE = 3,
-    CGSS_FILE_ACCESS_FORCE_DWORD = 0x7fffffff
+    _CGSS_FILE_ACCESS_FORCE_DWORD = 0x7fffffff,
 } CGSS_FILE_ACCESS;
diff --git a/src/lib/cgss_enum.h b/src/lib/cgss_enum.h
@@ -45,6 +45,7 @@ CGSS_NS_BEGIN
     enum class AcbWaveformEncodeType : uint8_t {
         Adx = CGSS_ACB_WAVEFORM_ADX,
         Hca = CGSS_ACB_WAVEFORM_HCA,
+        Hca2 = CGSS_ACB_WAVEFORM_HCA2,
         Vag = CGSS_ACB_WAVEFORM_VAG,
         Atrac3 = CGSS_ACB_WAVEFORM_ATRAC3,
         BcWav = CGSS_ACB_WAVEFORM_BCWAV,