diff --git a/CHANGE.txt b/CHANGE.txt index ebd11c2..3724fd7 100644 --- a/CHANGE.txt +++ b/CHANGE.txt @@ -1,4 +1,7 @@ 更新履歴 +TAG057 2021/08/23 + 各dllの差し替えのみ + TAG056 2021/03/17 Driver:PPZ8のPCMロード処理の修正 diff --git a/PMDDotNETDriver/driver.cs b/PMDDotNETDriver/driver.cs index cc4d295..a731482 100644 --- a/PMDDotNETDriver/driver.cs +++ b/PMDDotNETDriver/driver.cs @@ -281,8 +281,16 @@ public object GetWork() throw new NotImplementedException(); } - public void Init(string fileName, Action opnaWrite, Action opnaWaitSend, MmlDatum[] srcBuf, object addtionalOption) + public void Init(List chipsAction, MmlDatum[] srcBuf, Func appendFileReaderCallback_, object addtionalOption) { + // throw new NotImplementedException(); + //} + + //public void Init(Action opnaWrite, Action opnaWaitSend, MmlDatum[] srcBuf, object addtionalOption) + //{ + Action opnaWrite = chipsAction[0].WriteRegister; + Action opnaWaitSend = chipsAction[0].WaitSend; + object[] option = (object[])addtionalOption; object[] pdnos = (object[])option[0]; @@ -305,7 +313,7 @@ public void Init(string fileName, Action opnaWrite, Action Func appendFileReaderCallback = (pdnos.Length < 13 || pdnos[12] == null) - ? CreateAppendFileReaderCallback(Path.GetDirectoryName(fileName)) + ? CreateAppendFileReaderCallback(Path.GetDirectoryName(pdno.srcFile)) : (Func)pdnos[12]; if (pdnos.Length == 14) @@ -588,5 +596,6 @@ public void SetDriverSwitch(params object[] param) { throw new NotImplementedException(); } + } } diff --git a/PMDDotNETPlayer/lib/MDSound.dll b/PMDDotNETPlayer/lib/MDSound.dll index f19a399..d44cb2b 100644 Binary files a/PMDDotNETPlayer/lib/MDSound.dll and b/PMDDotNETPlayer/lib/MDSound.dll differ diff --git a/PMDDotNETPlayer/lib/RealChipCtlWrap.dll b/PMDDotNETPlayer/lib/RealChipCtlWrap.dll index c7cda4f..3b5add0 100644 Binary files a/PMDDotNETPlayer/lib/RealChipCtlWrap.dll and b/PMDDotNETPlayer/lib/RealChipCtlWrap.dll differ diff --git a/PMDDotNETPlayer/lib/fmgenmodule.dll b/PMDDotNETPlayer/lib/fmgenmodule.dll new file mode 100644 index 0000000..46dd7a1 Binary files /dev/null and b/PMDDotNETPlayer/lib/fmgenmodule.dll differ diff --git a/PMDDotNETPlayer/lib/scci.dll b/PMDDotNETPlayer/lib/scci.dll index ea7fa68..e075e93 100644 Binary files a/PMDDotNETPlayer/lib/scci.dll and b/PMDDotNETPlayer/lib/scci.dll differ diff --git a/PMDDotNETPlayer/lib/scci.ini b/PMDDotNETPlayer/lib/scci.ini index b484c0b..633f2fb 100644 --- a/PMDDotNETPlayer/lib/scci.ini +++ b/PMDDotNETPlayer/lib/scci.ini @@ -1,2 +1,75 @@ [scci] -DelayTime=100 +DelayTime=0 +[SPFM Light(COM4)] +ACTIVE=1 +SLOT_00_CHIP_NAME=YMF262 +SLOT_00_CHIP_ID=9 +SLOT_00_CHIP_ID_CMP1=11 +SLOT_00_CHIP_ID_CMP2=8 +SLOT_00_CHIP_CLOCK=14318180 +SLOT_00_CHIP_CLOCK_CMP1=3579545 +SLOT_00_CHIP_CLOCK_CMP2=3579545 +SLOT_00_CHIP_LOCATION=0 +SLOT_01_CHIP_NAME=NONE +SLOT_01_CHIP_ID=0 +SLOT_01_CHIP_ID_CMP1=0 +SLOT_01_CHIP_ID_CMP2=0 +SLOT_01_CHIP_CLOCK=0 +SLOT_01_CHIP_CLOCK_CMP1=0 +SLOT_01_CHIP_CLOCK_CMP2=0 +SLOT_01_CHIP_LOCATION=0 +[Internal] +ACTIVE=0 +VOLUME=127 +[SCCIDISP] +POS_X=0 +POS_Y=0 +ALLDISP=0 +[MIDI] +ACTIVE=0 +DEVICE_ID1=0 +DEVICE_ID2=0 +DEVICE_ID3=0 +DEVICE_ID4=0 +DEVICE_ID1_NAME= +DEVICE_ID2_NAME= +DEVICE_ID3_NAME= +DEVICE_ID4_NAME= +[SPW(COM6)] +ACTIVE=1 +[c86ctl] +ACTIVE=0 +[RESPFM(COM5)] +ACTIVE=1 +SLOT_00_CHIP_NAME=YM2151 +SLOT_00_CHIP_ID=2 +SLOT_00_CHIP_ID_CMP1=0 +SLOT_00_CHIP_ID_CMP2=0 +SLOT_00_CHIP_CLOCK=4000000 +SLOT_00_CHIP_CLOCK_CMP1=0 +SLOT_00_CHIP_CLOCK_CMP2=0 +SLOT_00_CHIP_LOCATION=3 +SLOT_01_CHIP_NAME=YM2608 +SLOT_01_CHIP_ID=1 +SLOT_01_CHIP_ID_CMP1=4 +SLOT_01_CHIP_ID_CMP2=6 +SLOT_01_CHIP_CLOCK=7987200 +SLOT_01_CHIP_CLOCK_CMP1=3993600 +SLOT_01_CHIP_CLOCK_CMP2=1996800 +SLOT_01_CHIP_LOCATION=3 +SLOT_02_CHIP_NAME=YM2612 +SLOT_02_CHIP_ID=5 +SLOT_02_CHIP_ID_CMP1=0 +SLOT_02_CHIP_ID_CMP2=0 +SLOT_02_CHIP_CLOCK=7670454 +SLOT_02_CHIP_CLOCK_CMP1=0 +SLOT_02_CHIP_CLOCK_CMP2=0 +SLOT_02_CHIP_LOCATION=3 +SLOT_03_CHIP_NAME=SN76489 +SLOT_03_CHIP_ID=7 +SLOT_03_CHIP_ID_CMP1=0 +SLOT_03_CHIP_ID_CMP2=0 +SLOT_03_CHIP_CLOCK=3579545 +SLOT_03_CHIP_CLOCK_CMP1=0 +SLOT_03_CHIP_CLOCK_CMP2=0 +SLOT_03_CHIP_LOCATION=0 diff --git a/PMDDotNETPlayer/lib/scciconfig.exe b/PMDDotNETPlayer/lib/scciconfig.exe new file mode 100644 index 0000000..26bb093 Binary files /dev/null and b/PMDDotNETPlayer/lib/scciconfig.exe differ diff --git a/lib/musicDriverInterface.dll b/lib/musicDriverInterface.dll index 98ab1e3..dbbd9ef 100644 Binary files a/lib/musicDriverInterface.dll and b/lib/musicDriverInterface.dll differ