diff --git a/EuroSoundExplorer2/PanelDocks/Misc/FormMediaPlayer.cs b/EuroSoundExplorer2/PanelDocks/Misc/FormMediaPlayer.cs index 8b47863..80b9632 100644 --- a/EuroSoundExplorer2/PanelDocks/Misc/FormMediaPlayer.cs +++ b/EuroSoundExplorer2/PanelDocks/Misc/FormMediaPlayer.cs @@ -111,6 +111,7 @@ private void ButtonSave_Click(object sender, EventArgs e) //Save Data if (soundToPlay.channels > 1) { + WaveFileWriter.CreateWaveFile16(filePath, audioFunctions.CreateStereoWav(ref providerLeft, ref providerRight, soundToPlay.PcmData, soundToPlay).ToSampleProvider()); } else diff --git a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.Designer.cs b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.Designer.cs index 86754aa..2f0024e 100644 --- a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.Designer.cs +++ b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.Designer.cs @@ -44,11 +44,11 @@ private void InitializeComponent() this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.ButtonSendToSamplePool = new System.Windows.Forms.ToolStripButton(); this.ButtonListProperties = new System.Windows.Forms.ToolStripButton(); + this.ButtonCheckDuplicated = new System.Windows.Forms.ToolStripButton(); this.ButtonApplyFilter = new System.Windows.Forms.ToolStripButton(); this.txtBoxSearch = new System.Windows.Forms.ToolStripTextBox(); this.lblTotalHashCodes = new System.Windows.Forms.ToolStripLabel(); this.txtSfxCount = new System.Windows.Forms.ToolStripTextBox(); - this.ButtonCheckDuplicated = new System.Windows.Forms.ToolStripButton(); this.contextMenuListView.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); @@ -170,6 +170,18 @@ private void InitializeComponent() this.ButtonListProperties.Text = "List selected item properties"; this.ButtonListProperties.ToolTipText = "List selected item properties"; // + // ButtonCheckDuplicated + // + this.ButtonCheckDuplicated.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ButtonCheckDuplicated.Image = ((System.Drawing.Image)(resources.GetObject("ButtonCheckDuplicated.Image"))); + this.ButtonCheckDuplicated.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.ButtonCheckDuplicated.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ButtonCheckDuplicated.Name = "ButtonCheckDuplicated"; + this.ButtonCheckDuplicated.Size = new System.Drawing.Size(30, 32); + this.ButtonCheckDuplicated.Text = "toolStripButton1"; + this.ButtonCheckDuplicated.ToolTipText = "Check for duplicated"; + this.ButtonCheckDuplicated.Click += new System.EventHandler(this.ButtonCheckDuplicated_Click); + // // ButtonApplyFilter // this.ButtonApplyFilter.CheckOnClick = true; @@ -191,8 +203,8 @@ private void InitializeComponent() // lblTotalHashCodes // this.lblTotalHashCodes.Name = "lblTotalHashCodes"; - this.lblTotalHashCodes.Size = new System.Drawing.Size(35, 32); - this.lblTotalHashCodes.Text = "Total:"; + this.lblTotalHashCodes.Size = new System.Drawing.Size(43, 32); + this.lblTotalHashCodes.Text = "Count:"; // // txtSfxCount // @@ -203,18 +215,6 @@ private void InitializeComponent() this.txtSfxCount.Size = new System.Drawing.Size(50, 35); this.txtSfxCount.Text = "0"; // - // ButtonCheckDuplicated - // - this.ButtonCheckDuplicated.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ButtonCheckDuplicated.Image = ((System.Drawing.Image)(resources.GetObject("ButtonCheckDuplicated.Image"))); - this.ButtonCheckDuplicated.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.ButtonCheckDuplicated.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ButtonCheckDuplicated.Name = "ButtonCheckDuplicated"; - this.ButtonCheckDuplicated.Size = new System.Drawing.Size(30, 32); - this.ButtonCheckDuplicated.Text = "toolStripButton1"; - this.ButtonCheckDuplicated.ToolTipText = "Check for duplicated"; - this.ButtonCheckDuplicated.Click += new System.EventHandler(this.ButtonCheckDuplicated_Click); - // // FormSB_HashCodes // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.resx b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.resx index ce3a2eb..8c39192 100644 --- a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.resx +++ b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_HashCodes.resx @@ -151,7 +151,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACG - CQAAAk1TRnQBSQFMAgEBAwEAAXABAAFwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAXgBAAF4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.Designer.cs b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.Designer.cs index 64a556e..9dd4c94 100644 --- a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.Designer.cs +++ b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.Designer.cs @@ -58,6 +58,8 @@ private void InitializeComponent() this.Col_SamplePool_PitchRnd = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Col_SamplePool_Pan = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.Col_SamplePool_PanRnd = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.labelCount = new System.Windows.Forms.ToolStripLabel(); + this.TextboxSamplesCount = new System.Windows.Forms.ToolStripTextBox(); this.contextMenuStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); @@ -137,7 +139,9 @@ private void InitializeComponent() this.ButtonSendToMediaPlayer, this.ButtonApplyEffects, this.toolStripSeparator4, - this.ButtonItemUsage}); + this.ButtonItemUsage, + this.labelCount, + this.TextboxSamplesCount}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(425, 35); @@ -272,6 +276,19 @@ private void InitializeComponent() this.Col_SamplePool_PanRnd.Text = "Pan +/-"; this.Col_SamplePool_PanRnd.Width = 90; // + // labelCount + // + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(43, 32); + this.labelCount.Text = "Count:"; + // + // TextboxSamplesCount + // + this.TextboxSamplesCount.Font = new System.Drawing.Font("Segoe UI", 9F); + this.TextboxSamplesCount.Name = "TextboxSamplesCount"; + this.TextboxSamplesCount.Size = new System.Drawing.Size(40, 35); + this.TextboxSamplesCount.Text = "0"; + // // FormSB_SamplePool // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -318,5 +335,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton ButtonItemUsage; protected internal ListView_ColumnSortingClick listView1; private System.Windows.Forms.ToolStripButton ButtonApplyEffects; + private System.Windows.Forms.ToolStripLabel labelCount; + private System.Windows.Forms.ToolStripTextBox TextboxSamplesCount; } } \ No newline at end of file diff --git a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.cs b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.cs index 741adab..07958ea 100644 --- a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.cs +++ b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.cs @@ -211,6 +211,7 @@ public void ShowSampleData(Sample sampleData) listView1.Items.Add(listViewItem); } listView1.EndUpdate(); + TextboxSamplesCount.Text = listView1.Items.Count.ToString(); } //------------------------------------------------------------------------------------------- diff --git a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.resx b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.resx index 2f4fbfe..aecf0ae 100644 --- a/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.resx +++ b/EuroSoundExplorer2/PanelDocks/SoundBanks/FormSB_SamplePool.resx @@ -174,7 +174,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACw - CAAAAk1TRnQBSQFMAwEBAAFYAQABWAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + CAAAAk1TRnQBSQFMAwEBAAFgAQABYAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm diff --git a/EuroSoundExplorer2/PanelDocks/StreamBanks/FormStreamBank.cs b/EuroSoundExplorer2/PanelDocks/StreamBanks/FormStreamBank.cs index 70cc612..157ef6b 100644 --- a/EuroSoundExplorer2/PanelDocks/StreamBanks/FormStreamBank.cs +++ b/EuroSoundExplorer2/PanelDocks/StreamBanks/FormStreamBank.cs @@ -54,7 +54,7 @@ public void ShowStreamData() } //Create item - ListViewItem listViewItem2 = new ListViewItem(new string[] { i.ToString(), "??", blockPos, currentSample.MarkerSize.ToString(), audioOff, currentSample.AudioSize.ToString(), currentSample.BaseVolume.ToString() }) + ListViewItem listViewItem2 = new ListViewItem(new string[] { (i+1).ToString(), "??", blockPos, currentSample.MarkerSize.ToString(), audioOff, currentSample.AudioSize.ToString(), currentSample.BaseVolume.ToString() }) { ImageIndex = 0, Tag = i diff --git a/EuroSoundExplorer2/Properties/AssemblyInfo.cs b/EuroSoundExplorer2/Properties/AssemblyInfo.cs index 6e4e206..0c47c23 100644 --- a/EuroSoundExplorer2/Properties/AssemblyInfo.cs +++ b/EuroSoundExplorer2/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión // utilizando el carácter "*", como se muestra a continuación: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.4.0")] -[assembly: AssemblyFileVersion("2.0.4.0")] +[assembly: AssemblyVersion("2.0.5.0")] +[assembly: AssemblyFileVersion("2.0.5.0")] diff --git a/MusX/CalculusLoopOffsets.cs b/MusX/CalculusLoopOffsets.cs index 53f626b..e6ea8b5 100644 --- a/MusX/CalculusLoopOffsets.cs +++ b/MusX/CalculusLoopOffsets.cs @@ -21,7 +21,7 @@ public static uint ReverseGetXboxAlignedNumber(uint inputValue) //------------------------------------------------------------------------------------------------------------------------------- public static uint GetSoundBankEurocomImaLoopOffset(uint loopOffsetPS2) { - uint positionAligned = (uint)(loopOffsetPS2 * 3.498389); + uint positionAligned = (uint)(loopOffsetPS2 * 3.4453125); return GetLoopOffsetAligned(positionAligned); }