From a3aef99ca62df4b25d288132a02b7994fc4d2cee Mon Sep 17 00:00:00 2001 From: NicknineTheEagle Date: Sat, 14 Aug 2021 13:52:31 +0300 Subject: [PATCH 1/2] EA SCHl: Added missing indexes and defaults --- src/meta/ea_schl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/meta/ea_schl.c b/src/meta/ea_schl.c index 292f78a4..2bab4a25 100644 --- a/src/meta/ea_schl.c +++ b/src/meta/ea_schl.c @@ -30,11 +30,11 @@ /* CODEC1 values were used early, then they migrated to CODEC2 values */ #define EA_CODEC1_NONE -1 #define EA_CODEC1_PCM 0x00 -#define EA_CODEC1_VAG 0x01 /* unsure */ +//#define EA_CODEC1_IMA 0x02 /* not used (sx.exe internal defs) */ +#define EA_CODEC1_N64 0x05 +#define EA_CODEC1_VAG 0x06 #define EA_CODEC1_EAXA 0x07 #define EA_CODEC1_MT10 0x09 -#define EA_CODEC1_N64 0x64 /* unknown but probably before MT10 */ - #define EA_CODEC2_NONE -1 #define EA_CODEC2_S16LE_INT 0x00 @@ -1809,6 +1809,7 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs else ea->codec2 = ea->bps==8 ? EA_CODEC2_S8 : (ea->big_endian ? EA_CODEC2_S16BE : EA_CODEC2_S16LE); break; + case EA_CODEC1_N64: ea->codec2 = EA_CODEC2_N64; break; case EA_CODEC1_VAG: ea->codec2 = EA_CODEC2_VAG; break; case EA_CODEC1_EAXA: if (ea->platform == EA_PLATFORM_PC || ea->platform == EA_PLATFORM_MAC) @@ -1817,7 +1818,6 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs ea->codec2 = EA_CODEC2_EAXA; break; case EA_CODEC1_MT10: ea->codec2 = EA_CODEC2_MT10; break; - case EA_CODEC1_N64: ea->codec2 = EA_CODEC2_N64; break; default: VGM_LOG("EA SCHl: unknown codec1 0x%02x\n", ea->codec1); goto fail; @@ -1830,6 +1830,7 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs case EA_PLATFORM_GENERIC: ea->codec2 = EA_CODEC2_EAXA; break; case EA_PLATFORM_PC: ea->codec2 = EA_CODEC2_EAXA; break; case EA_PLATFORM_PSX: ea->codec2 = EA_CODEC2_VAG; break; + case EA_PLATFORM_N64: ea->codec2 = EA_CODEC2_N64; break; case EA_PLATFORM_MAC: ea->codec2 = EA_CODEC2_EAXA; break; case EA_PLATFORM_PS2: ea->codec2 = EA_CODEC2_VAG; break; case EA_PLATFORM_GC: ea->codec2 = EA_CODEC2_S16BE; break; @@ -1837,7 +1838,7 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs case EA_PLATFORM_X360: ea->codec2 = EA_CODEC2_EAXA; break; case EA_PLATFORM_PSP: ea->codec2 = EA_CODEC2_EAXA; break; case EA_PLATFORM_PS3: ea->codec2 = EA_CODEC2_EAXA; break; - //case EA_PLATFORM_WII: ea->codec2 = EA_CODEC2_EAXA; break; /* not set? */ + case EA_PLATFORM_WII: ea->codec2 = EA_CODEC2_GCADPCM; break; case EA_PLATFORM_3DS: ea->codec2 = EA_CODEC2_GCADPCM; break; default: VGM_LOG("EA SCHl: unknown default codec2 for platform 0x%02x\n", ea->platform); From 707d37342c692e27f032d4e031578d6e76bd2a36 Mon Sep 17 00:00:00 2001 From: NicknineTheEagle Date: Sat, 14 Aug 2021 14:03:50 +0300 Subject: [PATCH 2/2] Line break fixes --- cli/vgmstream_cli.vcxproj.filters | 42 +++--- ext_libs/Getopt/getopt.vcxproj | 176 +++++++++++------------ fb2k/foo_input_vgmstream.vcxproj.filters | 92 ++++++------ xmplay/xmp-vgmstream.vcxproj.filters | 34 ++--- 4 files changed, 172 insertions(+), 172 deletions(-) diff --git a/cli/vgmstream_cli.vcxproj.filters b/cli/vgmstream_cli.vcxproj.filters index 7ffb42b7..57e5973a 100644 --- a/cli/vgmstream_cli.vcxproj.filters +++ b/cli/vgmstream_cli.vcxproj.filters @@ -1,22 +1,22 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + \ No newline at end of file diff --git a/ext_libs/Getopt/getopt.vcxproj b/ext_libs/Getopt/getopt.vcxproj index a2f2ed54..dea05db8 100644 --- a/ext_libs/Getopt/getopt.vcxproj +++ b/ext_libs/Getopt/getopt.vcxproj @@ -1,89 +1,89 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {330B53AE-4FAE-46DA-8785-9016DB4E3E23} - getopt - Win32Proj - - - - - - - - - 8.1 - - - - StaticLibrary - true - v141_xp - MultiByte - - - StaticLibrary - v141_xp - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - - - - Disabled - EnableFastChecks - MultiThreadedDebug - Precise - - - Level3 - EditAndContinue - - - - - MultiThreaded - - - Level3 - ProgramDatabase - Fast - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {330B53AE-4FAE-46DA-8785-9016DB4E3E23} + getopt + Win32Proj + + + + + + + + + 8.1 + + + + StaticLibrary + true + v141_xp + MultiByte + + + StaticLibrary + v141_xp + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + EnableFastChecks + MultiThreadedDebug + Precise + + + Level3 + EditAndContinue + + + + + MultiThreaded + + + Level3 + ProgramDatabase + Fast + + + + + + + + + + + \ No newline at end of file diff --git a/fb2k/foo_input_vgmstream.vcxproj.filters b/fb2k/foo_input_vgmstream.vcxproj.filters index e32e1f7c..e95e0f46 100644 --- a/fb2k/foo_input_vgmstream.vcxproj.filters +++ b/fb2k/foo_input_vgmstream.vcxproj.filters @@ -1,47 +1,47 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Source Files - - - Source Files - - - Source Files - - + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/xmplay/xmp-vgmstream.vcxproj.filters b/xmplay/xmp-vgmstream.vcxproj.filters index b1ae4ed0..7189a2f1 100644 --- a/xmplay/xmp-vgmstream.vcxproj.filters +++ b/xmplay/xmp-vgmstream.vcxproj.filters @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - {6505ad02-c535-487f-bcb4-745b0a6cb8e7} - - + + + + + + + + + + + + + + + {6505ad02-c535-487f-bcb4-745b0a6cb8e7} + + \ No newline at end of file