Skip to content

Commit

Permalink
TAG057 2021/08/23
Browse files Browse the repository at this point in the history
  各dllの差し替えのみ
  • Loading branch information
kumatan committed Aug 23, 2021
1 parent 9db1c70 commit b54701e
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
�X�V����
TAG057 2021/08/23
�edll�̍����ւ��̂�

TAG056 2021/03/17
Driver:PPZ8��PCM���[�h�����̏C��

Expand Down
13 changes: 11 additions & 2 deletions PMDDotNETDriver/driver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,16 @@ public object GetWork()
throw new NotImplementedException();
}

public void Init(string fileName, Action<ChipDatum> opnaWrite, Action<long, int> opnaWaitSend, MmlDatum[] srcBuf, object addtionalOption)
public void Init(List<ChipAction> chipsAction, MmlDatum[] srcBuf, Func<string, Stream> appendFileReaderCallback_, object addtionalOption)
{
// throw new NotImplementedException();
//}

//public void Init(Action<ChipDatum> opnaWrite, Action<long, int> opnaWaitSend, MmlDatum[] srcBuf, object addtionalOption)
//{
Action<ChipDatum> opnaWrite = chipsAction[0].WriteRegister;
Action<long, int> opnaWaitSend = chipsAction[0].WaitSend;

object[] option = (object[])addtionalOption;

object[] pdnos = (object[])option[0];
Expand All @@ -305,7 +313,7 @@ public void Init(string fileName, Action<ChipDatum> opnaWrite, Action<long, int>

Func<string, Stream> appendFileReaderCallback =
(pdnos.Length < 13 || pdnos[12] == null)
? CreateAppendFileReaderCallback(Path.GetDirectoryName(fileName))
? CreateAppendFileReaderCallback(Path.GetDirectoryName(pdno.srcFile))
: (Func<string, Stream>)pdnos[12];

if (pdnos.Length == 14)
Expand Down Expand Up @@ -588,5 +596,6 @@ public void SetDriverSwitch(params object[] param)
{
throw new NotImplementedException();
}

}
}
Binary file modified PMDDotNETPlayer/lib/MDSound.dll
Binary file not shown.
Binary file modified PMDDotNETPlayer/lib/RealChipCtlWrap.dll
Binary file not shown.
Binary file added PMDDotNETPlayer/lib/fmgenmodule.dll
Binary file not shown.
Binary file modified PMDDotNETPlayer/lib/scci.dll
Binary file not shown.
75 changes: 74 additions & 1 deletion PMDDotNETPlayer/lib/scci.ini
Original file line number Diff line number Diff line change
@@ -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
Binary file added PMDDotNETPlayer/lib/scciconfig.exe
Binary file not shown.
Binary file modified lib/musicDriverInterface.dll
Binary file not shown.

0 comments on commit b54701e

Please sign in to comment.