Add support in the dataviewer for the new files.

Author: jmarti856

EuroSoundExplorer2/Forms/FrmDataViewer.cs

@@ -17,6 +17,8 @@ public partial class FrmDataViewer : Form
         private readonly MusicBankReader musReader = new MusicBankReader();
         private readonly SbiBankReader sbiReader = new SbiBankReader();
         private readonly ProjectDetailsReader projDetReader = new ProjectDetailsReader();
+        private readonly SoundDetailsReader soundDetailsReader = new SoundDetailsReader();
+        private readonly MusicDetailsReader musicDetailsReader = new MusicDetailsReader();
         private readonly int m_ErrorCount = 0;
         private string sfxFilePath = string.Empty;
 
@@ -78,6 +80,12 @@ private void FrmDataViewer_Load(object sender, EventArgs e)
                         case FileType.ProjectDetails:
                             ShowProjectDetails(sfxFilePath);
                             break;
+                        case FileType.SoundDetailsFile:
+                            ShowSoundDetails(sfxFilePath);
+                            break;
+                        case FileType.MusicDetails:
+                            ShowMusicDetails(sfxFilePath);
+                            break;
                         default:
                             MessageBox.Show("Could not load this file, probably is from an unsupported version or game.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                             Close();

EuroSoundExplorer2/Forms/FrmDataViewer_SoundBanks.cs

@@ -282,6 +282,66 @@ private void ShowProjectDetails(string filePath)
             }
         }
 
+        //-------------------------------------------------------------------------------------------------------------------------------
+        private void ShowSoundDetails(string filePath)
+        {
+            //Read File Data 
+            SfxHeaderData headerData = soundDetailsReader.ReadSfxHeader(filePath, ((FrmMain)Application.OpenForms[nameof(FrmMain)]).configuration.PlatformSelected.ToString());
+            SoundDetails fileData = soundDetailsReader.ReadSoundDetailsFile(filePath, headerData);
+
+            //Add data
+            TreeNode soundDetailsInfo = ShowHeaderData(headerData, "SoundDetails Info");
+
+            TreeNode hashCodesData = new TreeNode("HashCodes Info");
+            soundDetailsInfo.Nodes.Add(hashCodesData);
+            TreeAdd(hashCodesData, nameof(fileData.MinHashCode), fileData.MinHashCode);
+            TreeAdd(hashCodesData, nameof(fileData.MaxHashCode), fileData.MaxHashCode);
+
+            //Print Project Slots
+            TreeNode sfxsData = new TreeNode("SFXs Info " + fileData.sfxItems.Length);
+            soundDetailsInfo.Nodes.Add(sfxsData);
+            foreach (SoundDetailsData item in fileData.sfxItems)
+            {
+                TreeNode memSlot = new TreeNode(string.Format("u32 {0} = {1} (0x{1:X8})", nameof(item.HashCode), item.HashCode));
+                sfxsData.Nodes.Add(memSlot);
+                TreeAdd(memSlot, nameof(item.InnerRadius), item.InnerRadius);
+                TreeAdd(memSlot, nameof(item.OuterRadius), item.OuterRadius);
+                TreeAdd(memSlot, nameof(item.Duration), item.Duration);
+                TreeAdd(memSlot, nameof(item.Looping), item.Looping);
+                TreeAdd(memSlot, nameof(item.Tracking3D), item.Tracking3D);
+                TreeAdd(memSlot, nameof(item.SampleStreamed), item.SampleStreamed);
+                TreeAdd(memSlot, nameof(item.Is3D), item.Is3D);
+            }
+        }
+
+        //-------------------------------------------------------------------------------------------------------------------------------
+        private void ShowMusicDetails(string filePath)
+        {
+            //Read File Data 
+            SfxHeaderData headerData = musicDetailsReader.ReadSfxHeader(filePath, ((FrmMain)Application.OpenForms[nameof(FrmMain)]).configuration.PlatformSelected.ToString());
+            MusicDetails fileData = musicDetailsReader.ReadMusicDetailsFile(filePath, headerData);
+
+            //Add data
+            TreeNode soundDetailsInfo = ShowHeaderData(headerData, "MusicDetails Info");
+
+            TreeNode hashCodesData = new TreeNode("HashCodes Info");
+            soundDetailsInfo.Nodes.Add(hashCodesData);
+            TreeAdd(hashCodesData, nameof(fileData.MinHashCode), fileData.MinHashCode);
+            TreeAdd(hashCodesData, nameof(fileData.MaxHashCode), fileData.MaxHashCode);
+
+            //Print Project Slots
+            TreeNode sfxsData = new TreeNode("MFXs Info " + fileData.musicItems.Length);
+            soundDetailsInfo.Nodes.Add(sfxsData);
+            foreach (MusicDetailsData item in fileData.musicItems)
+            {
+                TreeNode memSlot = new TreeNode(string.Format("u32 {0} = {1} (0x{1:X8})", nameof(item.HashCode), item.HashCode));
+                sfxsData.Nodes.Add(memSlot);
+                TreeAdd(memSlot, nameof(item.Duration), item.Duration);
+                TreeAdd(memSlot, nameof(item.MusicLooping), item.MusicLooping);
+                TreeAdd(memSlot, nameof(item.UserValue), item.UserValue);
+            }
+        }
+
         //-------------------------------------------------------------------------------------------------------------------------------
         private TreeNode ShowHeaderData(SfxHeaderData headerData, string nodeName)
         {

EuroSoundExplorer2/PanelDocks/Details Files/Music Details/FrmMusicDetails.cs

@@ -24,7 +24,7 @@ public void ShowData()
             int m_ErrorCount = 0;
             lstvMfxItems.BeginUpdate();
             lstvMfxItems.Items.Clear();
-            foreach (MusicDetailsData itemToadd in fileData.sfxItems)
+            foreach (MusicDetailsData itemToadd in fileData.musicItems)
             {
                 ListViewItem itemToAdd = new ListViewItem(new string[]
                 {
@@ -41,7 +41,7 @@ public void ShowData()
             //Update labels
             txtHashCodeMax.Text = string.Format("0x{0:X8}", fileData.MaxHashCode);
             txtHashCodeMin.Text = string.Format("0x{0:X8}", fileData.MinHashCode);
-            txtItemsCount.Text = fileData.sfxItems.Length.ToString();
+            txtItemsCount.Text = fileData.musicItems.Length.ToString();
             txtErrorsCount.Text = m_ErrorCount.ToString();
         }
 

EuroSoundExplorer2/PanelDocks/Misc/FormSoundBankFiles.cs

@@ -471,7 +471,7 @@ public void LoadSelectedMusicDetails(string filePath)
 
             //Load data
             musicDetailsHeaderData = musicDetailsReader.ReadSfxHeader(filePath, ((FrmMain)Application.OpenForms[nameof(FrmMain)]).configuration.PlatformSelected.ToString());
-            musicDetails = musicDetailsReader.ReadSoundDetailsFile(filePath, projDetailsHeaderData);
+            musicDetails = musicDetailsReader.ReadMusicDetailsFile(filePath, projDetailsHeaderData);
 
             ((FrmMain)Application.OpenForms[nameof(FrmMain)]).pnlMusicDetailsData.ShowData();
         }

MusX/Objects/MusicDetails.cs

@@ -7,7 +7,7 @@ public class MusicDetails
     {
         public uint MinHashCode;
         public uint MaxHashCode;
-        public MusicDetailsData[] sfxItems;
+        public MusicDetailsData[] musicItems;
     }
 
     //-------------------------------------------------------------------------------------------------------------------------------

MusX/Readers/Details Files/MusicDetailsReader.cs

@@ -66,7 +66,7 @@ public override SfxHeaderData ReadSfxHeader(string filePath, string platform)
         }
 
         //-------------------------------------------------------------------------------------------------------------------------------
-        public MusicDetails ReadSoundDetailsFile(string filePath, SfxHeaderData sfxHeaderData)
+        public MusicDetails ReadMusicDetailsFile(string filePath, SfxHeaderData sfxHeaderData)
         {
             MusicDetails projectData = new MusicDetails();
             using (BinaryReader BReader = new BinaryReader(File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)))
@@ -78,8 +78,8 @@ public MusicDetails ReadSoundDetailsFile(string filePath, SfxHeaderData sfxHeade
                 uint hashCodePrefix = (0xFFFF0000 & projectData.MinHashCode);
 
                 //Read each stored SFX
-                projectData.sfxItems = new MusicDetailsData[(int)(0x0000FFFF & projectData.MaxHashCode)];
-                for (int i = 0; i < projectData.sfxItems.Length; i++)
+                projectData.musicItems = new MusicDetailsData[(int)(0x0000FFFF & projectData.MaxHashCode)];
+                for (int i = 0; i < projectData.musicItems.Length; i++)
                 {
                     MusicDetailsData sfxItem = new MusicDetailsData
                     {
@@ -88,7 +88,7 @@ public MusicDetails ReadSoundDetailsFile(string filePath, SfxHeaderData sfxHeade
                         MusicLooping = Convert.ToBoolean(BReader.ReadUInt32()),
                         UserValue = BReader.ReadUInt32(),
                     };
-                    projectData.sfxItems[i] = sfxItem;
+                    projectData.musicItems[i] = sfxItem;
                 }
             }