diff options
author | couriersud <couriersud@arcor.de> | 2015-01-14 01:05:38 +0100 |
---|---|---|
committer | couriersud <couriersud@arcor.de> | 2015-01-14 01:05:38 +0100 |
commit | 11af4265a0678b3e3835d12ff0852bd72592f439 (patch) | |
tree | be19aafe1f3dfd2dcad0f21cac2d9b7e6a93adaf /src/osd/modules/lib/osdobj_common.h | |
parent | 410c8e8a1b63a426ad2871270aeafc15720a2d68 (diff) |
OSD Updates:
- OSD can now use OPTION_COMMAND; added execute_command handler to
osd_interface.
- moved list_network_devices and list_midi_devices to OSD
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.h')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index 67c57a61c73..3a9ee4d9783 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -20,9 +20,8 @@ // Defines //============================================================ -/* FIXME: void cli_frontend::listnetworkadapters should be - * moved here. - */ +#define OSDCOMMAND_LIST_MIDI_DEVICES "listmidi" +#define OSDCOMMAND_LIST_NETWORK_ADAPTERS "listnetwork" #define OSDOPTION_DEBUGGER "debugger" #define OSDOPTION_WATCHDOG "watchdog" @@ -161,17 +160,8 @@ public: // video overridables virtual void *get_slider_list(); - // midi overridables - // FIXME: this should return a list of devices, not list them on stdout - virtual void list_midi_devices(void); - - virtual void list_network_adapters() - { - network_init(); - osd_list_network_adapters(); - network_exit(); - } - + // command option overrides + virtual bool execute_command(const char *command); // FIXME: everything below seems to be osd specific and not part of // this INTERFACE but part of the osd IMPLEMENTATION @@ -193,8 +183,6 @@ public: virtual bool sound_init(); virtual void sound_register(); - virtual bool input_init(); - virtual void input_pause(); virtual void input_resume(); virtual bool output_init(); virtual bool network_init(); @@ -217,6 +205,10 @@ public: osd_options &options() { return m_options; } +protected: + virtual bool input_init(); + virtual void input_pause(); + private: // internal state running_machine * m_machine; |