XMA Studio and batch AT3 and XMA converters

hyperbx · Jun 16, 2019 · c6406e7 · c6406e7
1 parent 35ca441
commit c6406e7
Show file tree

Hide file tree

Showing 26 changed files with 7,381 additions and 328 deletions.
diff --git a/Sonic '06 Toolkit/Forms/About.Designer.cs b/Sonic '06 Toolkit/Forms/About.Designer.cs
diff --git a/Sonic '06 Toolkit/Forms/About.resx b/Sonic '06 Toolkit/Forms/About.resx
@@ -1139,7 +1139,10 @@ CRI Middleware Co. - CRI Atom Encoder
 Radfordhound - HedgeLib
 in - extract-xiso
 SONY Computer Entertainment Inc. - ATRAC3plus Codec TOOL
-GerbilSoft - mst06</value>
+GerbilSoft - mst06
+Microsoft Corporation - XMA Encode 2008
+NonamiEight - XMA Research
+Reimous - XMA Research</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

diff --git a/Sonic '06 Toolkit/Forms/Notifications/Status.cs b/Sonic '06 Toolkit/Forms/Notifications/Status.cs
@@ -117,6 +117,7 @@ void Status_Notifier_Load(object sender, EventArgs e)
                 lbl_unpackState.Text = "Encoding WAV files. Please wait...";
                 pnl_windowCheck.BackColor = Color.AliceBlue; BackColor = Color.AliceBlue;
                 Width = 300;
+                Height = 138;
             }
             else if (Tools.Global.ddsState == "dds" || Tools.Global.ddsState == "launch-dds")
             {
@@ -152,6 +153,7 @@ void Status_Notifier_Load(object sender, EventArgs e)
                 lbl_unpackState.Text = "Repacking CSBs. Please wait...";
                 pnl_windowCheck.BackColor = Color.AliceBlue; BackColor = Color.AliceBlue;
                 Width = 212;
+                Height = 138;
             }
             else if (Tools.Global.lubState == "decompile" || Tools.Global.lubState == "launch-decompile" || Tools.Global.lubState == "decompile-all")
             {
@@ -180,6 +182,24 @@ void Status_Notifier_Load(object sender, EventArgs e)
                 Width = 219;
                 Height = 138;
             }
+            else if (Tools.Global.xmaState == "xma" || Tools.Global.xmaState == "launch-xma" || Tools.Global.xmaState == "xma-repatch" || Tools.Global.xmaState == "xma-launch-repatch")
+            {
+                NOW_LOADING.Visible = false;
+                Text = "Encoding XMAs...";
+                lbl_unpackState.Text = "Encoding XMAs. Please wait...";
+                pnl_windowCheck.BackColor = Color.FromArgb(239, 224, 201); BackColor = Color.FromArgb(239, 224, 201);
+                Width = 284;
+                Height = 138;
+            }
+            else if (Tools.Global.xmaState == "wav")
+            {
+                NOW_LOADING.Visible = false;
+                Text = "Encoding WAV files...";
+                lbl_unpackState.Text = "Encoding WAV files. Please wait...";
+                pnl_windowCheck.BackColor = Color.FromArgb(239, 224, 201); BackColor = Color.FromArgb(239, 224, 201);
+                Width = 300;
+                Height = 138;
+            }
             else if (Tools.Global.exisoState == "extract")
             {
                 NOW_LOADING.Visible = false;

diff --git a/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.Designer.cs b/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.Designer.cs
diff --git a/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.cs b/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.cs
@@ -61,9 +61,7 @@ void AT3_Studio_Load(object sender, EventArgs e)
             }
             else { MessageBox.Show("There are no encodable files in this directory.", "No files available", MessageBoxButtons.OK, MessageBoxIcon.Information); Close(); }
 
-            tm_wholeLoopCheck.Start();
-
-            if (Properties.Settings.Default.wholeLoop == true) looping_Whole.Checked = true;
+            if (Properties.Settings.Default.AT3wholeLoop == true) looping_Whole.Checked = true; else looping_Whole.Checked = false;
         }
 
         void Btn_SelectAll_Click(object sender, EventArgs e)
@@ -213,7 +211,7 @@ void Btn_Convert_Click(object sender, EventArgs e)
             }
             else
             {
-                MessageBox.Show("AT3 State set to invalid value: " + Tools.Global.adxState + "\nLine information: " + new System.Diagnostics.StackTrace(true).GetFrame(1).GetFileLineNumber(), "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("AT3 State set to invalid value: " + Tools.Global.at3State + "\nLine information: " + new System.Diagnostics.StackTrace(true).GetFrame(1).GetFileLineNumber(), "Developer Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
@@ -222,12 +220,12 @@ void Looping_Whole_CheckedChanged(object sender, EventArgs e)
             if (looping_Whole.Checked == true)
             {
                 wholeLoop = "-wholeloop ";
-                Properties.Settings.Default.wholeLoop = true;
+                Properties.Settings.Default.AT3wholeLoop = true;
             }
             else
             {
                 wholeLoop = "";
-                Properties.Settings.Default.wholeLoop = false;
+                Properties.Settings.Default.AT3wholeLoop = false;
             }
             Properties.Settings.Default.Save();
         }
@@ -238,11 +236,6 @@ void Looping_Whole_CheckedChanged(object sender, EventArgs e)
         //    new Loop().ShowDialog();
         //}
 
-        void Tm_wholeLoopCheck_Tick(object sender, EventArgs e)
-        {
-            if (wholeLoop != "") looping_Whole.Checked = true; else looping_Whole.Checked = false;
-        }
-
         void AT3_Studio_FormClosing(object sender, FormClosingEventArgs e)
         {
             Tools.Global.at3State = null;

diff --git a/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.resx b/Sonic '06 Toolkit/Forms/Studios/AT3 Studio.resx
@@ -4860,9 +4860,6 @@
         MTf8Hy49c8egYf2MAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="tm_wholeLoopCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>152, 17</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAUAEBAAAAEAIABoBAAAVgAAABgYAAABACAAiAkAAL4EAAAgIAAAAQAgAKgQAABGDgAAMDAAAAEA