Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Converted midi into a module. (nw)

Browse Source
This commit is contained in:
couriersud 2015-01-31 02:39:40 +01:00
parent 7333404896
commit 8c3b8d43c7
12 changed files with 289 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emu/imagedev/midiin.c
View File

@ -8,6 +8,7 @@
#include "emu.h"
#include "midiin.h"
#include "osdepend.h"
/***************************************************************************
IMPLEMENTATION
@ -77,9 +78,9 @@ void midiin_device::device_timer(emu_timer &timer, device_timer_id id, int param
return;
}
while (osd_poll_midi_channel(m_midi))
while (m_midi->poll())
{
bytesRead = osd_read_midi_channel(m_midi, buf);
bytesRead = m_midi->read(buf);
if (bytesRead > 0)
{
@ -97,10 +98,12 @@ void midiin_device::device_timer(emu_timer &timer, device_timer_id id, int param
bool midiin_device::call_load(void)
{
m_midi = osd_open_midi_input(filename());
m_midi = machine().osd().create_midi_device();
if (m_midi == NULL)
if (!m_midi->open_input(filename()))
{
global_free(m_midi);
m_midi = NULL;
return IMAGE_INIT_FAIL;
}
@ -117,7 +120,8 @@ void midiin_device::call_unload(void)
{
if (m_midi)
{
osd_close_midi_channel(m_midi);
m_midi->close();
global_free(m_midi);
}
m_timer->enable(false);
m_midi = NULL;

13
src/emu/imagedev/midiout.c
View File

@ -7,6 +7,7 @@
*********************************************************************/
#include "emu.h"
#include "osdepend.h"
#include "midiout.h"
/***************************************************************************
@ -63,10 +64,12 @@ void midiout_device::device_config_complete(void)
bool midiout_device::call_load(void)
{
m_midi = osd_open_midi_output(filename());
m_midi = machine().osd().create_midi_device();
if (m_midi == NULL)
if (!m_midi->open_output(filename()))
{
global_free(m_midi);
m_midi = NULL;
return IMAGE_INIT_FAIL;
}
@ -81,7 +84,9 @@ void midiout_device::call_unload(void)
{
if (m_midi)
{
osd_close_midi_channel(m_midi);
m_midi->close();
global_free(m_midi);
m_midi = NULL;
}
}
@ -92,6 +97,6 @@ void midiout_device::rcv_complete() // Rx completed receiving byte
if (m_midi)
{
osd_write_midi_channel(m_midi, data);
m_midi->write(data);
}
}

36
src/osd/modules/lib/osdobj_common.c
View File

@ -131,6 +131,8 @@ void osd_common_t::register_options()
REGISTER_MODULE(m_mod_man, NETDEV_TAPTUN);
REGISTER_MODULE(m_mod_man, NETDEV_PCAP);
REGISTER_MODULE(m_mod_man, MIDI_PM);
REGISTER_MODULE(m_mod_man, MIDI_NONE);
// after initialization we know which modules are supported
@ -148,6 +150,15 @@ void osd_common_t::register_options()
dnames.append(names[i]);
update_option(OSD_SOUND_PROVIDER, dnames);
#if 0
// Register midi options and update options
m_mod_man.get_module_names(OSD_DEBUG_PROVIDER, 20, &num, names);
dnames.reset();
for (int i = 0; i < num; i++)
dnames.append(names[i]);
update_option(OSD_DEBUG_PROVIDER, dnames);
#endif
// Register debugger options and update options
m_mod_man.get_module_names(OSD_DEBUG_PROVIDER, 20, &num, names);
dnames.reset();
@ -416,7 +427,15 @@ bool osd_common_t::execute_command(const char *command)
}
else if (strcmp(command, OSDCOMMAND_LIST_MIDI_DEVICES) == 0)
{
osd_list_midi_devices();
osd_module *om = select_module_options(options(), OSD_MIDI_PROVIDER);
midi_module *pm = select_module_options<midi_module *>(options(), OSD_MIDI_PROVIDER);
if (om->probe())
{
om->init();
pm->list_midi_devices();
om->exit();
}
return true;
}
@ -441,7 +460,6 @@ void osd_common_t::init_subsystems()
machine().add_notifier(MACHINE_NOTIFY_RESUME, machine_notify_delegate(FUNC(osd_common_t::input_resume), this));
output_init();
midi_init();
m_font_module = select_module_options<font_module *>(options(), OSD_FONT_PROVIDER);
@ -453,6 +471,8 @@ void osd_common_t::init_subsystems()
select_module_options<netdev_module *>(options(), OSD_NETDEV_PROVIDER);
m_midi = select_module_options<midi_module *>(options(), OSD_MIDI_PROVIDER);
m_mod_man.init();
}
@ -499,7 +519,6 @@ void osd_common_t::exit_subsystems()
video_exit();
input_exit();
output_exit();
midi_exit();
}
void osd_common_t::video_exit()
@ -530,14 +549,3 @@ void osd_common_t::video_options_add(const char *name, void *type)
//m_video_options.add(name, type, false);
m_video_names.append(core_strdup(name));
}
bool osd_common_t::midi_init()
{
// this should be done on the OS_level
return osd_midi_init();
}
void osd_common_t::midi_exit()
{
osd_midi_exit();
}

6
src/osd/modules/lib/osdobj_common.h
View File

@ -19,6 +19,7 @@
#include "modules/sound/sound_module.h"
#include "modules/debugger/debug_module.h"
#include "modules/netdev/netdev_module.h"
#include "modules/midi/midi_module.h"
#include "cliopts.h"
//============================================================
@ -148,6 +149,8 @@ public:
osd_font *font_alloc() { return m_font_module->font_alloc(); }
osd_midi_device *create_midi_device() { return m_midi->create_midi_device(); }
// FIXME: everything below seems to be osd specific and not part of
// this INTERFACE but part of the osd IMPLEMENTATION
@ -165,14 +168,12 @@ public:
virtual void input_resume();
virtual bool output_init();
virtual bool midi_init();
virtual void exit_subsystems();
virtual void video_exit();
virtual void window_exit();
virtual void input_exit();
virtual void output_exit();
virtual void midi_exit();
virtual void osd_exit();
@ -216,6 +217,7 @@ private:
protected:
sound_module* m_sound;
debug_module* m_debugger;
midi_module* m_midi;
private:
//tagmap_t<osd_video_type> m_video_options;
dynamic_array<const char *> m_video_names;

30
src/osd/modules/midi/midi_module.h Normal file
View File

@ -0,0 +1,30 @@
/*
* midi_module.h
*
*/
#ifndef MIDI_MODULE_H_
#define MIDI_MODULE_H_
#include "osdepend.h"
#include "modules/osdmodule.h"
//============================================================
// CONSTANTS
//============================================================
#define OSD_MIDI_PROVIDER "midiprovider"
class midi_module
{
public:
virtual ~midi_module() { }
// specific routines
virtual osd_midi_device *create_midi_device() = 0;
// FIXME: should return a list of strings ...
virtual void list_midi_devices(void) = 0;
};
#endif /* MIDI_MODULE_H_ */

103
src/osd/modules/midi/none.c
View File

@ -7,50 +7,89 @@
*******************************************************************c********/
#include "osdcore.h"
#include "corealloc.h"
#include "modules/osdmodule.h"
#include "midi_module.h"
struct osd_midi_device
class none_module : public osd_module, public midi_module
{
public:
none_module()
: osd_module(OSD_MIDI_PROVIDER, "pm"), midi_module()
{
}
virtual ~none_module() { }
virtual int init();
virtual void exit();
osd_midi_device *create_midi_device();
void list_midi_devices(void);
};
class osd_midi_device_none : public osd_midi_device
{
public:
virtual ~osd_midi_device_none() { }
virtual bool open_input(const char *devname);
virtual bool open_output(const char *devname);
virtual void close();
virtual bool poll();
virtual int read(UINT8 *pOut);
virtual void write(UINT8 data);
private:
int dummy;
};
bool osd_midi_init()
osd_midi_device *none_module::create_midi_device()
{
return true;
return global_alloc(osd_midi_device_none());
}
void osd_midi_exit()
{
}
void osd_list_midi_devices(void)
{
osd_printf_warning("\nMIDI is not supported in this build\n");
}
osd_midi_device *osd_open_midi_input(const char *devname)
{
return NULL;
}
osd_midi_device *osd_open_midi_output(const char *devname)
{
return NULL;
}
void osd_close_midi_channel(osd_midi_device *dev)
{
}
bool osd_poll_midi_channel(osd_midi_device *dev)
{
return false;
}
int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
int none_module::init()
{
return 0;
}
void osd_write_midi_channel(osd_midi_device *dev, UINT8 data)
void none_module::exit()
{
}
void none_module::list_midi_devices(void)
{
osd_printf_warning("\nMIDI is not supported in this build\n");
}
bool osd_midi_device_none::open_input(const char *devname)
{
return false;
}
bool osd_midi_device_none::open_output(const char *devname)
{
return false;
}
void osd_midi_device_none::close()
{
}
bool osd_midi_device_none::poll()
{
return false;
}
int osd_midi_device_none::read(UINT8 *pOut)
{
return 0;
}
void osd_midi_device_none::write(UINT8 data)
{
}
MODULE_DEFINITION(MIDI_NONE, none_module)

201
src/osd/modules/midi/portmidi.c
View File

@ -6,16 +6,49 @@
*******************************************************************c********/
#ifndef NO_USE_MIDI
#include "portmidi/pm_common/portmidi.h"
#include "osdcore.h"
#include "corealloc.h"
#include "modules/osdmodule.h"
#include "midi_module.h"
class pm_module : public osd_module, public midi_module
{
public:
pm_module()
: osd_module(OSD_MIDI_PROVIDER, "pm"), midi_module()
{
}
virtual ~pm_module() { }
virtual int init();
virtual void exit();
osd_midi_device *create_midi_device();
void list_midi_devices(void);
};
static const int RX_EVENT_BUF_SIZE = 512;
#define MIDI_SYSEX 0xf0
#define MIDI_EOX 0xf7
struct osd_midi_device
class osd_midi_device_pm : public osd_midi_device
{
public:
virtual ~osd_midi_device_pm() { }
virtual bool open_input(const char *devname);
virtual bool open_output(const char *devname);
virtual void close();
virtual bool poll();
virtual int read(UINT8 *pOut);
virtual void write(UINT8 data);
private:
PortMidiStream *pmStream;
PmEvent rx_evBuf[RX_EVENT_BUF_SIZE];
UINT8 xmit_in[4]; // Pm_Messages mean we can at most have 3 residue bytes
@ -24,18 +57,24 @@ struct osd_midi_device
bool rx_sysex;
};
bool osd_midi_init()
osd_midi_device *pm_module::create_midi_device()
{
Pm_Initialize();
return true;
return global_alloc(osd_midi_device_pm());
}
void osd_midi_exit()
int pm_module::init()
{
Pm_Initialize();
return 0;
}
void pm_module::exit()
{
Pm_Terminate();
}
void osd_list_midi_devices(void)
void pm_module::list_midi_devices(void)
{
int num_devs = Pm_CountDevices();
const PmDeviceInfo *pmInfo;
@ -71,13 +110,12 @@ void osd_list_midi_devices(void)
}
}
osd_midi_device *osd_open_midi_input(const char *devname)
bool osd_midi_device_pm::open_input(const char *devname)
{
int num_devs = Pm_CountDevices();
int found_dev = -1;
const PmDeviceInfo *pmInfo;
PortMidiStream *stm;
osd_midi_device *ret;
if (!strcmp("default", devname))
{
@ -104,30 +142,27 @@ osd_midi_device *osd_open_midi_input(const char *devname)
{
if (Pm_OpenInput(&stm, found_dev, NULL, RX_EVENT_BUF_SIZE, NULL, NULL) == pmNoError)
{
ret = (osd_midi_device *)osd_malloc(sizeof(osd_midi_device));
memset(ret, 0, sizeof(osd_midi_device));
ret->pmStream = stm;
return ret;
pmStream = stm;
return true;
}
else
{
printf("Couldn't open PM device\n");
return NULL;
return false;
}
}
else
{
return NULL;
return false;
}
}
osd_midi_device *osd_open_midi_output(const char *devname)
bool osd_midi_device_pm::open_output(const char *devname)
{
int num_devs = Pm_CountDevices();
int found_dev = -1;
const PmDeviceInfo *pmInfo;
PortMidiStream *stm;
osd_midi_device *ret;
if (!strcmp("default", devname))
{
@ -154,40 +189,37 @@ osd_midi_device *osd_open_midi_output(const char *devname)
{
if (Pm_OpenOutput(&stm, found_dev, NULL, 100, NULL, NULL, 0) == pmNoError)
{
ret = (osd_midi_device *)osd_malloc(sizeof(osd_midi_device));
memset(ret, 0, sizeof(osd_midi_device));
ret->pmStream = stm;
return ret;
pmStream = stm;
return true;
}
else
{
printf("Couldn't open PM device\n");
return NULL;
return false;
}
}
else
{
return NULL;
return false;
}
return NULL;
return false;
}
void osd_close_midi_channel(osd_midi_device *dev)
void osd_midi_device_pm::close()
{
Pm_Close(dev->pmStream);
osd_free(dev);
Pm_Close(pmStream);
}
bool osd_poll_midi_channel(osd_midi_device *dev)
bool osd_midi_device_pm::poll()
{
PmError chk = Pm_Poll(dev->pmStream);
PmError chk = Pm_Poll(pmStream);
return (chk == pmGotData) ? true : false;
}
int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
int osd_midi_device_pm::read(UINT8 *pOut)
{
int msgsRead = Pm_Read(dev->pmStream, dev->rx_evBuf, RX_EVENT_BUF_SIZE);
int msgsRead = Pm_Read(pmStream, rx_evBuf, RX_EVENT_BUF_SIZE);
int bytesOut = 0;
if (msgsRead <= 0)
@ -197,17 +229,17 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
for (int msg = 0; msg < msgsRead; msg++)
{
UINT8 status = Pm_MessageStatus(dev->rx_evBuf[msg].message);
UINT8 status = Pm_MessageStatus(rx_evBuf[msg].message);
if (dev->rx_sysex)
if (rx_sysex)
{
if (status & 0x80) // sys real-time imposing on us?
{
if ((status == 0xf2) || (status == 0xf3))
{
*pOut++ = status;
*pOut++ = Pm_MessageData1(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData1(rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(rx_evBuf[msg].message);
bytesOut += 3;
}
else
@ -216,7 +248,7 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
bytesOut++;
if (status == MIDI_EOX)
{
dev->rx_sysex = false;
rx_sysex = false;
}
}
}
@ -224,15 +256,15 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
{
for (int i = 0; i < 4; i++)
{
UINT8 byte = dev->rx_evBuf[msg].message & 0xff;
UINT8 byte = rx_evBuf[msg].message & 0xff;
*pOut++ = byte;
bytesOut++;
if (byte == MIDI_EOX)
{
dev->rx_sysex = false;
rx_sysex = false;
break;
}
dev->rx_evBuf[msg].message >>= 8;
rx_evBuf[msg].message >>= 8;
}
}
}
@ -243,7 +275,7 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
case 0xc: // 2-byte messages
case 0xd:
*pOut++ = status;
*pOut++ = Pm_MessageData1(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData1(rx_evBuf[msg].message);
bytesOut += 2;
break;
@ -253,25 +285,25 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
case 0: // System Exclusive
{
*pOut++ = status; // this should be OK: the shortest legal sysex is F0 tt dd F7, I believe
*pOut++ = (dev->rx_evBuf[msg].message>>8) & 0xff;
*pOut++ = (dev->rx_evBuf[msg].message>>16) & 0xff;
UINT8 last = *pOut++ = (dev->rx_evBuf[msg].message>>24) & 0xff;
*pOut++ = (rx_evBuf[msg].message>>8) & 0xff;
*pOut++ = (rx_evBuf[msg].message>>16) & 0xff;
UINT8 last = *pOut++ = (rx_evBuf[msg].message>>24) & 0xff;
bytesOut += 4;
dev->rx_sysex = (last != MIDI_EOX);
rx_sysex = (last != MIDI_EOX);
break;
}
case 7: // End of System Exclusive
*pOut++ = status;
bytesOut += 1;
dev->rx_sysex = false;
rx_sysex = false;
break;
case 2: // song pos
case 3: // song select
*pOut++ = status;
*pOut++ = Pm_MessageData1(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData1(rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(rx_evBuf[msg].message);
bytesOut += 3;
break;
@ -282,8 +314,8 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
default:
*pOut++ = status;
*pOut++ = Pm_MessageData1(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(dev->rx_evBuf[msg].message);
*pOut++ = Pm_MessageData1(rx_evBuf[msg].message);
*pOut++ = Pm_MessageData2(rx_evBuf[msg].message);
bytesOut += 3;
break;
}
@ -293,57 +325,57 @@ int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut)
return bytesOut;
}
void osd_write_midi_channel(osd_midi_device *dev, UINT8 data)
void osd_midi_device_pm::write(UINT8 data)
{
int bytes_needed = 0;
PmEvent ev;
ev.timestamp = 0; // use the current time
// printf("write: %02x (%d)\n", data, dev->xmit_cnt);
// printf("write: %02x (%d)\n", data, xmit_cnt);
// reject data bytes when no valid status exists
if ((dev->last_status == 0) && !(data & 0x80))
if ((last_status == 0) && !(data & 0x80))
{
dev->xmit_cnt = 0;
xmit_cnt = 0;
return;
}
if (dev->xmit_cnt >= 4)
if (xmit_cnt >= 4)
{
printf("MIDI out: packet assembly overflow, contact MAMEdev!\n");
return;
}
// handle sysex
if (dev->last_status == MIDI_SYSEX)
if (last_status == MIDI_SYSEX)
{
// printf("sysex: %02x (%d)\n", data, dev->xmit_cnt);
// printf("sysex: %02x (%d)\n", data, xmit_cnt);
// if we get a status that isn't sysex, assume it's system common
if ((data & 0x80) && (data != MIDI_EOX))
{
// printf("common during sysex!\n");
ev.message = Pm_Message(data, 0, 0);
Pm_Write(dev->pmStream, &ev, 1);
Pm_Write(pmStream, &ev, 1);
return;
}
dev->xmit_in[dev->xmit_cnt++] = data;
xmit_in[xmit_cnt++] = data;
// if EOX or 4 bytes filled, transmit 4 bytes
if ((dev->xmit_cnt == 4) || (data == MIDI_EOX))
if ((xmit_cnt == 4) || (data == MIDI_EOX))
{
ev.message = dev->xmit_in[0] | (dev->xmit_in[1]<<8) | (dev->xmit_in[2]<<16) | (dev->xmit_in[3]<<24);
Pm_Write(dev->pmStream, &ev, 1);
dev->xmit_in[0] = dev->xmit_in[1] = dev->xmit_in[2] = dev->xmit_in[3] = 0;
dev->xmit_cnt = 0;
ev.message = xmit_in[0] | (xmit_in[1]<<8) | (xmit_in[2]<<16) | (xmit_in[3]<<24);
Pm_Write(pmStream, &ev, 1);
xmit_in[0] = xmit_in[1] = xmit_in[2] = xmit_in[3] = 0;
xmit_cnt = 0;
// printf("SysEx packet: %08x\n", ev.message);
// if this is EOX, kill the running status
if (data == MIDI_EOX)
{
dev->last_status = 0;
last_status = 0;
}
}
@ -351,33 +383,33 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data)
}
// handle running status. don't allow system real-time messages to be considered as running status.
if ((dev->xmit_cnt == 0) && (data & 0x80) && (data < 0xf8))
if ((xmit_cnt == 0) && (data & 0x80) && (data < 0xf8))
{
dev->last_status = data;
last_status = data;
}
if ((dev->xmit_cnt == 0) && !(data & 0x80))
if ((xmit_cnt == 0) && !(data & 0x80))
{
dev->xmit_in[dev->xmit_cnt++] = dev->last_status;
dev->xmit_in[dev->xmit_cnt++] = data;
// printf("\trunning status: [%d] = %02x, [%d] = %02x, last_status = %02x\n", dev->xmit_cnt-2, dev->last_status, dev->xmit_cnt-1, data, dev->last_status);
xmit_in[xmit_cnt++] = last_status;
xmit_in[xmit_cnt++] = data;
// printf("\trunning status: [%d] = %02x, [%d] = %02x, last_status = %02x\n", xmit_cnt-2, last_status, xmit_cnt-1, data, last_status);
}
else
{
dev->xmit_in[dev->xmit_cnt++] = data;
// printf("\tNRS: [%d] = %02x\n", dev->xmit_cnt-1, data);
xmit_in[xmit_cnt++] = data;
// printf("\tNRS: [%d] = %02x\n", xmit_cnt-1, data);
}
if ((dev->xmit_cnt == 1) && (dev->xmit_in[0] == MIDI_SYSEX))
if ((xmit_cnt == 1) && (xmit_in[0] == MIDI_SYSEX))
{
// printf("Start SysEx!\n");
dev->last_status = MIDI_SYSEX;
last_status = MIDI_SYSEX;
return;
}
// are we there yet?
// printf("status check: %02x\n", dev->xmit_in[0]);
switch ((dev->xmit_in[0]>>4) & 0xf)
// printf("status check: %02x\n", xmit_in[0]);
switch ((xmit_in[0]>>4) & 0xf)
{
case 0xc: // 2-byte messages
case 0xd:
@ -385,7 +417,7 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data)
break;
case 0xf: // system common
switch (dev->xmit_in[0] & 0xf)
switch (xmit_in[0] & 0xf)
{
case 0: // System Exclusive is handled above
break;
@ -410,11 +442,20 @@ void osd_write_midi_channel(osd_midi_device *dev, UINT8 data)
break;
}
if (dev->xmit_cnt == bytes_needed)
if (xmit_cnt == bytes_needed)
{
ev.message = Pm_Message(dev->xmit_in[0], dev->xmit_in[1], dev->xmit_in[2]);
Pm_Write(dev->pmStream, &ev, 1);
dev->xmit_cnt = 0;
ev.message = Pm_Message(xmit_in[0], xmit_in[1], xmit_in[2]);
Pm_Write(pmStream, &ev, 1);
xmit_cnt = 0;
}
}
#else
#include "modules/osdmodule.h"
#include "netdev_module.h"
MODULE_NOT_SUPPORTED(pm_module, OSD_MIDI_PROVIDER, "pm")
#endif
MODULE_DEFINITION(MIDI_PM, pm_module)

2
src/osd/modules/sound/sdl_sound.c
View File

@ -12,7 +12,7 @@
#include "sound_module.h"
#include "modules/osdmodule.h"
#if (!defined(OSD_WINDOWS))
#if (!defined(OSD_WINDOWS) || defined(USE_SDL_SOUND))
// standard sdl header
#include "../../sdl/sdlinc.h"

27
src/osd/osdcore.h
View File

@ -887,21 +887,22 @@ file_error osd_get_full_path(char **dst, const char *path);
/***************************************************************************
MIDI I/O INTERFACES
***************************************************************************/
struct osd_midi_device;
bool osd_midi_init();
void osd_midi_exit();
void osd_list_midi_devices(void);
// free result with osd_close_midi_channel()
osd_midi_device *osd_open_midi_input(const char *devname);
// free result with osd_close_midi_channel()
osd_midi_device *osd_open_midi_output(const char *devname);
void osd_close_midi_channel(osd_midi_device *dev);
bool osd_poll_midi_channel(osd_midi_device *dev);
int osd_read_midi_channel(osd_midi_device *dev, UINT8 *pOut);
void osd_write_midi_channel(osd_midi_device *dev, UINT8 data);
class osd_midi_device
{
public:
virtual ~osd_midi_device() { }
// free result with osd_close_midi_channel()
virtual bool open_input(const char *devname) = 0;
// free result with osd_close_midi_channel()
virtual bool open_output(const char *devname) = 0;
virtual void close() = 0;
virtual bool poll() = 0;
virtual int read(UINT8 *pOut) = 0;
virtual void write(UINT8 data) = 0;
};
//FIXME: really needed here?
void osd_list_network_adapters(void);
/***************************************************************************

3
src/osd/osdepend.h
View File

@ -71,6 +71,9 @@ public:
// command option overrides
virtual bool execute_command(const char *command) = 0;
// midi interface
virtual osd_midi_device *create_midi_device() = 0;
};
#endif /* __OSDEPEND_H__ */

6
src/osd/sdl/sdl.mak
View File

@ -210,7 +210,6 @@ ifeq ($(TARGETOS),linux)
BASE_TARGETOS = unix
SYNC_IMPLEMENTATION = tc
SDL_NETWORK = taptun
#SDL_NETWORK = pcap
ifndef NO_USE_MIDI
INCPATH += `pkg-config --cflags alsa`
@ -448,11 +447,12 @@ OSDOBJS = \
$(OSDOBJ)/modules/font/font_none.o \
$(OSDOBJ)/modules/netdev/taptun.o \
$(OSDOBJ)/modules/netdev/pcap.o \
$(OSDOBJ)/modules/midi/portmidi.o \
$(OSDOBJ)/modules/midi/none.o \
ifdef NO_USE_MIDI
OSDOBJS += $(OSDOBJ)/modules/midi/none.o
DEFS += -DNO_USE_MIDI
else
OSDOBJS += $(OSDOBJ)/modules/midi/portmidi.o
endif
# Add SDL2.0 support

4
src/osd/windows/windows.mak
View File

@ -383,6 +383,7 @@ OSDOBJS = \
$(WINOBJ)/winmenu.o \
$(WINOBJ)/winmain.o \
$(OSDOBJ)/modules/midi/portmidi.o \
$(OSDOBJ)/modules/midi/none.o \
$(OSDOBJ)/modules/lib/osdobj_common.o \
$(OSDOBJ)/modules/font/font_sdl.o \
$(OSDOBJ)/modules/font/font_windows.o \
@ -392,8 +393,7 @@ OSDOBJS = \
$(OSDOBJ)/modules/netdev/taptun.o \
ifdef USE_SDL
OSDOBJS += \
$(OSDOBJ)/modules/sound/sdl_sound.o
DEFS += -DUSE_SDL_SOUND
endif
ifndef DONT_USE_NETWORK