TAG721 2024/02/29

Core,IDE:XGM2を追加。
kuma4649 · Feb 28, 2024 · 4a167e4 · 4a167e4
1 parent a830e10
commit 4a167e4
Show file tree

Hide file tree

Showing 35 changed files with 4,193 additions and 144 deletions.
diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt
@@ -1,4 +1,7 @@
 �X�V����
+TAG721 2024/02/29
+  Core,IDE:XGM2��ǉ��B
+
 TAG720 2024/02/04
   License��GPL�ɕύX
 

diff --git a/mml2vgm/Core/Core.csproj b/mml2vgm/Core/Core.csproj
@@ -70,11 +70,13 @@
     <Compile Include="chips\QSound.cs" />
     <Compile Include="chips\RF5C164.cs" />
     <Compile Include="chips\segaPcm.cs" />
+    <Compile Include="chips\SN76489X2.cs" />
     <Compile Include="chips\SN76489.cs" />
     <Compile Include="chips\VRC6.cs" />
     <Compile Include="chips\Y8950.cs" />
     <Compile Include="chips\YM2151.cs" />
     <Compile Include="chips\YM2203.cs" />
+    <Compile Include="chips\YM2612X2.cs" />
     <Compile Include="chips\YM3526.cs" />
     <Compile Include="chips\YM3812.cs" />
     <Compile Include="chips\YMF262.cs" />
@@ -110,12 +112,16 @@
     <Compile Include="partWork.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SourceParser.cs" />
+    <Compile Include="XGM2maker.cs" />
     <Compile Include="ZGMmaker.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="fnum\FNUM_Gigatron.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="fnum\FNUM_SN76489X2.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="fnum\FNUM_VRC6.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -143,6 +149,9 @@
     <Content Include="fnum\FNUM_Y8950.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="fnum\FNUM_YM2612X2.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="fnum\FNUM_YM3526.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/mml2vgm/Core/Enums.cs b/mml2vgm/Core/Enums.cs
@@ -4,6 +4,7 @@ public enum enmFormat
     {
         VGM,
         XGM,
+        XGM2,
         ZGM
     }
 
@@ -66,7 +67,9 @@ public enum enmChipType : int
         NES = 25,
         DMG = 26,
         VRC6 = 27,
-        Gigatron=28
+        Gigatron=28,
+        YM2612X2 = 29,
+        SN76489X2 = 30,
     }
 
     public enum EnmZGMDevice : int

diff --git a/mml2vgm/Core/GD3maker.cs b/mml2vgm/Core/GD3maker.cs
@@ -74,7 +74,7 @@ public void make(List<outDatum> dat, Information info, string lyric)
             dat.Add(new outDatum(enmMMLType.unknown, null, null, 0x00));
 
             //歌詞
-            if (lyric != "")
+            if (!string.IsNullOrEmpty(lyric))
             {
                 foreach (byte b in Encoding.Unicode.GetBytes(lyric)) dat.Add(new outDatum(enmMMLType.unknown, null, null, b));
                 dat.Add(new outDatum(enmMMLType.unknown, null, null, 0x00));

diff --git a/mml2vgm/Core/Information.cs b/mml2vgm/Core/Information.cs
@@ -144,22 +144,15 @@ private void SetFormat(string val)
                 case "VGM":
                 default:
                     format = enmFormat.VGM;
-                    //tempo = DEFAULT_TEMPO;
-                    //clockCount = DEFAULT_CLOCK_COUNT;
-                    //samplesPerClock = DEFAULT_SAMPLES_PER_CLOCK;
                     break;
                 case "XGM":
                     format = enmFormat.XGM;
-                    //tempo = DEFAULT_TEMPO;
-                    //clockCount = XGM_DEFAULT_CLOCK_COUNT;
-                    //samplesPerClock = XGM_DEFAULT_SAMPLES_PER_CLOCK;
-                    //samplesPerClock = xgmSamplesPerSecond * 60.0 * 4.0 / (tempo * clockCount);
+                    break;
+                case "XGM2":
+                    format = enmFormat.XGM2;
                     break;
                 case "ZGM":
                     format = enmFormat.ZGM;
-                    //tempo = DEFAULT_TEMPO;
-                    //clockCount = DEFAULT_CLOCK_COUNT;
-                    //samplesPerClock = DEFAULT_SAMPLES_PER_CLOCK;
                     break;
             }
         }
@@ -200,6 +193,7 @@ public void SetTimers()
                         samplesPerClock = Information.VGM_SAMPLE_PER_SECOND * 60.0 * 4.0 / (tempo * clockCount);
                         break;
                     case enmFormat.XGM:
+                    case enmFormat.XGM2:
                         samplesPerClock = xgmSamplesPerSecond * 60.0 * 4.0 / (tempo * clockCount);
                         break;
                     case enmFormat.ZGM:
@@ -217,6 +211,7 @@ public void SetTimers()
                         samplesPerClock = 44100 / vgmVsync;
                         break;
                     case enmFormat.XGM:
+                    case enmFormat.XGM2:
                         vgmVsync = (int)xgmSamplesPerSecond;
                         samplesPerClock = 1;
                         break;

diff --git a/mml2vgm/Core/MDSound.dll b/mml2vgm/Core/MDSound.dll