TAG733 2024/06/09

Core:自分が未対応のファイルをMDPlayerに送り付けようとするとハングするので対応しているかチェックするようにした。
kuma4649 · Jun 9, 2024 · 2ef6ec4 · 2ef6ec4
1 parent 5088bcf
commit 2ef6ec4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt
@@ -1,4 +1,7 @@
 �X�V����
+TAG733 2024/06/09
+  Core:���������Ή��̃t�@�C����MDPlayer�ɑ���t���悤�Ƃ���ƃn���O����̂őΉ����Ă��邩�`�F�b�N����悤�ɂ����B
+
 TAG732 2024/05/04
   mucomDotNET�̍����ւ�
 

diff --git a/mml2vgm/Core/MDSound.dll b/mml2vgm/Core/MDSound.dll
diff --git a/mml2vgm/mml2vgmIDEx64/ChipRegister.cs b/mml2vgm/mml2vgmIDEx64/ChipRegister.cs
@@ -5386,7 +5386,10 @@ private void YM3526WriteRegisterControl(Chip Chip, EnmDataType type, int address
                 if (Chip.Model == EnmVRModel.VirtualModel)
                 {
                     if (!ctYM3526[Chip.Number].UseScci && ctYM3526[Chip.Number].UseEmu)
+                    {
+                        //log.Write(string.Format("Adr:{0:X02} Dat:{1:X02}", (byte)address, (byte)data));
                         mds.WriteYM3526(Chip.Index, (byte)Chip.Number, (byte)address, (byte)data);
+                    }
                 }
                 if (Chip.Model == EnmVRModel.RealModel)
                 {

diff --git a/mml2vgm/mml2vgmIDEx64/form/FrmMain.cs b/mml2vgm/mml2vgmIDEx64/form/FrmMain.cs
@@ -4852,21 +4852,29 @@ private void tsmiExport_toDriverFormatAndPlay_Click(object sender, EventArgs e)
 
                 if (d == null) return;
 
+                string ext = Path.GetExtension(d.gwiFullPath).ToLower();
+
+                if (ext != ".muc" && ext != ".mml" && ext != ".gwi")
+                {
+                    MessageBox.Show("この形式のエクスポートに対応していません。", "エクスポート失敗", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
+
                 //コンパイル実施
                 Compile(false, false, false, false, true);
                 while (Compiling != 0) { Application.DoEvents(); }//待ち合わせ
 
-                if (Path.GetExtension(d.gwiFullPath).ToLower() == ".muc")
+                if (ext == ".muc")
                 {
                     foreach (MmlDatum md in mubData) buf.Add(md != null ? (byte)md.dat : (byte)0);
                     outFn = Path.ChangeExtension(d.gwiFullPath, ".mub");
                 }
-                else if (Path.GetExtension(d.gwiFullPath).ToLower() == ".mml")
+                else if (ext == ".mml")
                 {
                     foreach (MmlDatum md in mData) buf.Add((byte)md.dat);
                     outFn = Path.ChangeExtension(d.gwiFullPath, ".m");
                 }
-                else if (Path.GetExtension(d.gwiFullPath).ToLower() == ".gwi")
+                else if (ext == ".gwi")
                 {
                     string sf = Path.Combine(
                         Common.GetApplicationDataFolder(true)