Skip to content

Commit

Permalink
- Improved XGM timing
Browse files Browse the repository at this point in the history
  • Loading branch information
110-kenichi committed Apr 5, 2023
1 parent 40679ec commit d856207
Show file tree
Hide file tree
Showing 39 changed files with 1,689 additions and 1,469 deletions.
Binary file modified docs/MAmidiMEmo/Manual.pdf
Binary file not shown.
Binary file modified docs/MAmidiMEmo/Manual.pptx
Binary file not shown.
12 changes: 6 additions & 6 deletions src/emu/machine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ void SoundTimerCallback();
void CloseApplication();
void LoadData(unsigned char* data, int length);
int SaveData(void** saveBuf);
void SendMidiEvent(unsigned char data1, unsigned char data2, unsigned char data3);
void SendMidiSysEvent(unsigned char* data, int length);
void SendMidiEvent(LONG64 ticks, unsigned char data1, unsigned char data2, unsigned char data3);
void SendMidiSysEvent(LONG64 ticks, unsigned char* data, int length);
void DirectAccessToChip(unsigned char device_id, unsigned char unit, unsigned int address, unsigned int data);

void running_machine::mami_timer_callback(void* ptr, s32 param)
Expand Down Expand Up @@ -544,13 +544,13 @@ int running_machine::run(bool quiet)

return data;
});
m_rpcSrv->bind("SendMidiEvent", [&](unsigned char data1, unsigned char data2, unsigned char data3)
m_rpcSrv->bind("SendMidiEvent", [&](LONG64 ticks, unsigned char data1, unsigned char data2, unsigned char data3)
{
SendMidiEvent(data1, data2, data3);
SendMidiEvent(ticks, data1, data2, data3);
});
m_rpcSrv->bind("SendMidiSysEvent", [&](std::vector<unsigned char> buffer, int length)
m_rpcSrv->bind("SendMidiSysEvent", [&](LONG64 ticks, std::vector<unsigned char> buffer, int length)
{
SendMidiSysEvent(&buffer[0], length);
SendMidiSysEvent(ticks, &buffer[0], length);
});

m_rpcSrv->bind("DirectAccessToChip", [&](unsigned char device_id, unsigned char unit, unsigned int address, unsigned int data)
Expand Down
12 changes: 6 additions & 6 deletions src/emu/mamidimemo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ typedef void(CALLBACK* SoundUpdatedProc)();
typedef void(CALLBACK* RestartApplicationProc)();
typedef void(CALLBACK* SetVSTiModeProc)();
typedef int(CALLBACK* IsVSTiModeProc)();
typedef void(CALLBACK* SendMidiEventProc)(unsigned char data1, unsigned char data2, unsigned char data3);
typedef void(CALLBACK* SendMidiSysEventProc)(unsigned char *data, int length);
typedef void(CALLBACK* SendMidiEventProc)(LONG64 ticks, unsigned char data1, unsigned char data2, unsigned char data3);
typedef void(CALLBACK* SendMidiSysEventProc)(LONG64 ticks, unsigned char *data, int length);
typedef int(CALLBACK* CloseApplicationProc)();
typedef void(CALLBACK* LoadDataProc)(unsigned char* data, int length);
typedef int(CALLBACK* SaveDataProc)(void** saveBuf);
Expand Down Expand Up @@ -196,14 +196,14 @@ int IsVSTiMode()
return isVSTiMode();
}

void SendMidiEvent(unsigned char data1, unsigned char data2, unsigned char data3)
void SendMidiEvent(LONG64 ticks, unsigned char data1, unsigned char data2, unsigned char data3)
{
sendMidiEvent(data1, data2, data3);
sendMidiEvent(ticks, data1, data2, data3);
}

void SendMidiSysEvent(unsigned char *data, int length)
void SendMidiSysEvent(LONG64 ticks, unsigned char *data, int length)
{
sendMidiSysEvent(data, length);
sendMidiSysEvent(ticks, data, length);
}

void CloseApplication()
Expand Down
2 changes: 1 addition & 1 deletion src/mamidimemo/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<value>800, 600</value>
</setting>
<setting name="EnvFirWeight" serializeAs="String">
<value> 1, 1, 1, 1, 1 </value>
<value />
</setting>
<setting name="EnvEdSize" serializeAs="String">
<value>800, 600</value>
Expand Down
1 change: 1 addition & 0 deletions src/mamidimemo/ComponentModel/ToolStripBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected override void OnHandleCreated(EventArgs e)
/// <remarks>
/// Default value is false, which is the same behavior provided by the base ToolStrip class.
/// </remarks>
[DefaultValue(true)]
public bool ClickThrough
{
get
Expand Down
1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormFmEditor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2151Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2413Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2414Editor .Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2608Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2610BEditor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM2612Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM3806Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYM3812Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/mamidimemo/Gui/FMEditor/FormYMF262Editor.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d856207

Please sign in to comment.