STBL480 2024/11/08 3rd

Driver:AY:フレームカウンターのカウントアップができていなかった PianoRoll:Driver:AY追加
kuma4649 · Nov 8, 2024 · 90a0e94 · 90a0e94
1 parent 2c2c83a
commit 90a0e94
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V���� 
+STBL480 2024/11/08 3rd
+  Driver:AY:�t���[���J�E���^�[�̃J�E���g�A�b�v���ł��Ă��Ȃ�����
+  PianoRoll:Driver:AY�ǉ�
+
 STBL479 2024/11/08 2nd
   PianoRoll:Driver:ZMUSIC�ǉ�
 

diff --git a/MDPlayer/MDPlayer-STBL478.exe → MDPlayer/MDPlayer-STBL479.exe b/MDPlayer/MDPlayer-STBL478.exe → MDPlayer/MDPlayer-STBL479.exe
diff --git a/MDPlayer/MDPlayer_InstKit/02info.nsh b/MDPlayer/MDPlayer_InstKit/02info.nsh
@@ -1,4 +1,4 @@
 !define NAME "MDPlayer"
-!define VERSION "STBL478"
+!define VERSION "STBL479"
 !define PUBLISHER "Kumata"
 !define PACKAGE "${NAME} ${VERSION}"
diff --git a/MDPlayer/MDPlayerx64/Audio.cs b/MDPlayer/MDPlayerx64/Audio.cs
@@ -2621,6 +2621,16 @@ public static bool Play(Setting setting)
                 //    driverReal = new Driver.SID.sid();
                 //    driverReal.setting = setting;
                 //}
+
+                DriverPianoRoll = null;
+                if (setting.pianoRoll.usePianoRoll)
+                {
+                    DriverPianoRoll = new Driver.AY.AY
+                    {
+                        setting = setting
+                    };
+                }
+
                 return AyPlay(setting);
             }
 
@@ -2653,7 +2663,7 @@ public static bool Play(Setting setting)
                         setting = setting
                     };
                     ((Vgm)DriverPianoRoll).dacControl.chipRegister = chipRegister;
-                    ((Vgm)DriverPianoRoll).dacControl.model = EnmModel.RealModel;
+                    ((Vgm)DriverPianoRoll).dacControl.model = EnmModel.PianoRollModel;
                 }
 
                 return VgmPlay(setting);
@@ -2844,6 +2854,13 @@ public static bool AyPlay(Setting setting)
                         , (uint)(setting.outputDevice.SampleRate * setting.LatencySCCI / 1000)
                         , (uint)(setting.outputDevice.SampleRate * setting.outputDevice.WaitTime / 1000))) return false;
                 }
+                if (DriverPianoRoll != null)
+                {
+                    ((Driver.AY.AY)DriverPianoRoll).song = (byte)SongNo;
+                    if (!DriverPianoRoll.init(vgmBuf, chipRegister, EnmModel.PianoRollModel, new EnmChip[] { EnmChip.AY8910 }
+                        , (uint)(setting.outputDevice.SampleRate * setting.LatencySCCI / 1000)
+                        , (uint)(setting.outputDevice.SampleRate * setting.outputDevice.WaitTime / 1000))) return false;
+                }
 
                 //Play
 

diff --git a/MDPlayer/MDPlayerx64/Driver/AY/AY.cs b/MDPlayer/MDPlayerx64/Driver/AY/AY.cs
@@ -107,10 +107,7 @@ public override void oneFrameProc()
                         oneFrame();
                         Counter++;
                     }
-                    else
-                    {
-                        vgmFrameCounter++;
-                    }
+                    vgmFrameCounter++;
                 }
             }
             catch (Exception ex)