STBL488 2024/11/29

鍵盤:OPNA:音程が一個ずれて表示されてたのを修正コア:MUB(mucomDotNET):.MUBファイルを演奏できなかったのを修正コア:Visualizer:アイコン再設定
kuma4649 · Nov 28, 2024 · fb1e217 · fb1e217
1 parent 051679a
commit fb1e217
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 8 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,9 @@
 �X�V���� 
+STBL488 2024/11/29
+  ����:OPNA:�����������ĕ\������Ă��̂��C��
+  �R�A:MUB(mucomDotNET):.MUB�t�@�C�������t�ł��Ȃ������̂��C��
+  �R�A:Visualizer:�A�C�R���Đݒ�
+
 STBL487 2024/11/24
   �R�A:�v���O�����I������PlayList�̕\����Ԃ𐳂����ۑ��o���Ă��Ȃ������̂��C��
   �R�A:MIDI�L�[�{�[�h���g�p���Ȃ��ݒ�̏ꍇ��MIDI IN���g�p���Ȃ��悤�ɏC��

diff --git a/MDPlayer/MDPlayer-STBL487.exe b/MDPlayer/MDPlayer-STBL487.exe
diff --git a/MDPlayer/MDPlayer-STBL486.exe → MDPlayer/MDPlayer-STBL488.exe b/MDPlayer/MDPlayer-STBL486.exe → MDPlayer/MDPlayer-STBL488.exe
diff --git a/MDPlayer/MDPlayer_InstKit/02info.nsh b/MDPlayer/MDPlayer_InstKit/02info.nsh
@@ -1,4 +1,4 @@
 !define NAME "MDPlayer"
-!define VERSION "STBL487"
+!define VERSION "STBL488"
 !define PUBLISHER "Kumata"
 !define PACKAGE "${NAME} ${VERSION}"
diff --git a/MDPlayer/MDPlayerx64/Audio.cs b/MDPlayer/MDPlayerx64/Audio.cs
@@ -2174,6 +2174,15 @@ public static bool Play(Setting setting)
                     };
                     ((Driver.MucomDotNET)DriverReal).PlayingFileName = PlayingFileName;
                 }
+                DriverPianoRoll = null;
+                if (setting.pianoRoll.usePianoRoll)
+                {
+                    DriverPianoRoll = new Driver.MucomDotNET(MucomDotNETim)
+                    {
+                        setting = setting
+                    };
+                    ((Driver.MucomDotNET)DriverPianoRoll).PlayingFileName = PlayingFileName;
+                }
                 return MucPlay_mucomDotNET(setting, Driver.MucomDotNET.enmMUCOMFileType.MUB);
             }
 

diff --git a/MDPlayer/MDPlayerx64/form/KB/OPN/frmYM2608.cs b/MDPlayer/MDPlayerx64/form/KB/OPN/frmYM2608.cs
@@ -200,7 +200,7 @@ public void screenChangeParams()
                     ff /= 1038f;
 
                     if ((fmKeyYM2608[ch] & 1) != 0)
-                        n = Math.Min(Math.Max(Common.searchYM2608Adpcm(ff) , 0), 95);
+                        n = Math.Min(Math.Max(Common.searchYM2608Adpcm(ff)-1 , 0), 95);
 
                     byte con = (byte)(fmKeyYM2608[ch]);
                     int v = 127;

diff --git a/MDPlayer/MDPlayerx64/form/SYS/frmSetting.resx b/MDPlayer/MDPlayerx64/form/SYS/frmSetting.resx
@@ -10159,6 +10159,9 @@
   <data name="gbUseKeyBoardHook.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
+  <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>

diff --git a/MDPlayer/MDPlayerx64/form/SYS/frmVisWave.Designer.cs b/MDPlayer/MDPlayerx64/form/SYS/frmVisWave.Designer.cs
diff --git a/MDPlayer/MDPlayerx64/form/SYS/frmVisWave.resx b/MDPlayer/MDPlayerx64/form/SYS/frmVisWave.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,12 +117,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="pictureBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolStripContainer1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>104, 17</value>
   </metadata>
+  <metadata name="toolStrip1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <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">
     <value>