claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Different approach to CM-32L emulation, fixes it and MT-32.

Browse Source
This commit is contained in:
OBattler
2017-07-15 20:07:38 +02:00
parent 7c54006355
commit cc63eafce0
9 changed files with 145 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WIN/plat_midi.h
View File

@@ -1,8 +1,7 @@
void* plat_midi_init();
void plat_midi_close(void* p);
void plat_midi_play_msg(struct midi_device_t* device, uint8_t* val);
void plat_midi_play_sysex(struct midi_device_t* device, uint8_t* data, unsigned int len);
int plat_midi_write(struct midi_device_t* device, uint8_t val);
void plat_midi_init();
void plat_midi_close();
void plat_midi_play_msg(uint8_t* val);
void plat_midi_play_sysex(uint8_t* data, unsigned int len);
int plat_midi_write(uint8_t val);
int plat_midi_get_num_devs();
void plat_midi_get_dev_name(int num, char *s);
void plat_midi_add_status_info(char *s, int max_len, struct midi_device_t* device);

1
src/WIN/win.c
View File

@@ -42,7 +42,6 @@
#include "../video/video.h"
#include "../video/vid_ega.h"
#include "../mouse.h"
#include "../sound/midi.h"
#include "../sound/sound.h"
#include "../sound/snd_dbopl.h"
#include "plat_keyboard.h"

1
src/WIN/win_deviceconfig.c
View File

@@ -18,7 +18,6 @@
#include "../ibm.h"
#include "../config.h"
#include "../device.h"
#include "../sound/midi.h"
#include "plat_midi.h"
#define NO_UNICODE /*FIXME: not Unicode? */
#include "win.h"

109
src/WIN/win_midi.c
View File

@@ -5,68 +5,70 @@
#include "../SOUND/midi.h"
#include "plat_midi.h"
typedef struct plat_midi_t
{
int id;
char name[512];
HMIDIOUT midi_out_device;
HANDLE event;
MIDIHDR hdr;
} plat_midi_t;
int midi_id = 0;
static HMIDIOUT midi_out_device = NULL;
void* plat_midi_init()
{
plat_midi_t* data = malloc(sizeof(plat_midi_t));
memset(data, 0, sizeof(plat_midi_t));
HANDLE m_event;
static uint8_t midi_rt_buf[1024];
static uint8_t midi_cmd_buf[1024];
static int midi_cmd_pos = 0;
static int midi_cmd_len = 0;
static uint8_t midi_status = 0;
static unsigned int midi_sysex_start = 0;
static unsigned int midi_sysex_delay = 0;
void plat_midi_init()
{
/* This is for compatibility with old configuration files. */
data->id = config_get_int("Sound", "midi_host_device", -1);
if (data->id == -1)
midi_id = config_get_int("Sound", "midi_host_device", -1);
if (midi_id == -1)
{
data->id = config_get_int(SYSTEM_MIDI_NAME, "midi", 0);
midi_id = config_get_int(SYSTEM_MIDI_NAME, "midi", 0);
}
else
{
config_delete_var("Sound", "midi_host_device");
config_set_int(SYSTEM_MIDI_NAME, "midi", data->id);
config_set_int(SYSTEM_MIDI_NAME, "midi", midi_id);
}
MMRESULT hr = MMSYSERR_NOERROR;
data->event = CreateEvent(NULL, TRUE, TRUE, NULL);
memset(midi_rt_buf, 0, sizeof(midi_rt_buf));
memset(midi_cmd_buf, 0, sizeof(midi_cmd_buf));
hr = midiOutOpen(&data->midi_out_device, data->id, (DWORD) data->event,
midi_cmd_pos = midi_cmd_len = 0;
midi_status = 0;
midi_sysex_start = midi_sysex_delay = 0;
m_event = CreateEvent(NULL, TRUE, TRUE, NULL);
hr = midiOutOpen(&midi_out_device, midi_id, (DWORD) m_event,
0, CALLBACK_EVENT);
if (hr != MMSYSERR_NOERROR) {
printf("midiOutOpen error - %08X\n",hr);
data->id = 0;
hr = midiOutOpen(&data->midi_out_device, data->id, (DWORD) data->event,
midi_id = 0;
hr = midiOutOpen(&midi_out_device, midi_id, (DWORD) m_event,
0, CALLBACK_EVENT);
if (hr != MMSYSERR_NOERROR) {
printf("midiOutOpen error - %08X\n",hr);
free(data);
return 0;
return;
}
}
plat_midi_get_dev_name(data->id, data->name);
midiOutReset(data->midi_out_device);
return data;
midiOutReset(midi_out_device);
}
void plat_midi_close(void* p)
void plat_midi_close()
{
plat_midi_t* data = (plat_midi_t*)p;
if (data->midi_out_device != NULL)
if (midi_out_device != NULL)
{
midiOutReset(data->midi_out_device);
midiOutClose(data->midi_out_device);
midiOutReset(midi_out_device);
midiOutClose(midi_out_device);
/* midi_out_device = NULL; */
CloseHandle(data->event);
CloseHandle(m_event);
}
free(data);
}
int plat_midi_get_num_devs()
@@ -81,50 +83,43 @@ void plat_midi_get_dev_name(int num, char *s)
strcpy(s, caps.szPname);
}
void plat_midi_play_msg(midi_device_t* device, uint8_t *msg)
void plat_midi_play_msg(uint8_t *msg)
{
plat_midi_t* data = (plat_midi_t*)device->data;
midiOutShortMsg(data->midi_out_device, *(uint32_t *) msg);
midiOutShortMsg(midi_out_device, *(uint32_t *) msg);
}
void plat_midi_play_sysex(midi_device_t* device, uint8_t *sysex, unsigned int len)
MIDIHDR m_hdr;
void plat_midi_play_sysex(uint8_t *sysex, unsigned int len)
{
plat_midi_t* data = (plat_midi_t*)device->data;
MMRESULT result;
if (WaitForSingleObject(data->event, 2000) == WAIT_TIMEOUT)
if (WaitForSingleObject(m_event, 2000) == WAIT_TIMEOUT)
{
pclog("Can't send MIDI message\n");
return;
}
midiOutUnprepareHeader(data->midi_out_device, &data->hdr, sizeof(data->hdr));
midiOutUnprepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr));
data->hdr.lpData = (char *) sysex;
data->hdr.dwBufferLength = len;
data->hdr.dwBytesRecorded = len;
data->hdr.dwUser = 0;
m_hdr.lpData = (char *) sysex;
m_hdr.dwBufferLength = len;
m_hdr.dwBytesRecorded = len;
m_hdr.dwUser = 0;
result = midiOutPrepareHeader(data->midi_out_device, &data->hdr, sizeof(data->hdr));
result = midiOutPrepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr));
if (result != MMSYSERR_NOERROR) return;
ResetEvent(data->event);
result = midiOutLongMsg(data->midi_out_device, &data->hdr, sizeof(data->hdr));
ResetEvent(m_event);
result = midiOutLongMsg(midi_out_device, &m_hdr, sizeof(m_hdr));
if (result != MMSYSERR_NOERROR)
{
SetEvent(data->event);
SetEvent(m_event);
return;
}
}
int plat_midi_write(midi_device_t* device, uint8_t val)
int plat_midi_write(uint8_t val)
{
return 0;
}
void plat_midi_add_status_info(char *s, int max_len, struct midi_device_t* device)
{
char temps[512];
sprintf(temps, "MIDI out device: %s\n\n", ((plat_midi_t*)device->data)->name);
strncat(s, temps, max_len);
}