summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/midi
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-01-29 03:02:02 +1100
committer Vas Crabb <vas@vastheman.com>2023-01-29 03:16:14 +1100
commit68472d3d72ea4bbc545c0669348172b4e96c7b41 (patch)
treee34fca0f55c977624148d1c806ecc6c44a5edd11 /src/osd/modules/midi
parent01fcb2e0decf670a4cdee3d37b6f7ebde9b8f02b (diff)
Various input and OSD refactoring:
osd: Supply OSD object to modules on initialisation. Encapsulated some event handling in the OSD objects rather than leaving it in free functions. Put various stuff in namespaces. osd/modules/input: Enabled dinput, xinput and winhybrid modules for Windows SDL builds, and enabled background input for dinput and xinput (and by extension winhybrid) modules. Also fixed some COM and X11 resource leaks. osd/modules/input/input_sdl.cpp: Flipped SDL mouse button order to match Windows, and exposed vertical and horizontal scroll as Z and rZ axes. Moved SDL UI event handling out of input devices into OSD object. osd/modules/input_rawinput.cpp: Changed lightgun Z axis token so it's correctly identified as a relative axis (it maps to the scroll wheel equivalent). osd: Added an option to choose the network provider module. Mostly useful if you build with both TUN/TAP and pcap support included, or if you want to disable emulated networking completely. emu/input.cpp: Use a better strategy for assembling input code names that uses fewer temporary strings and doesn't require use of the non-Unicode-aware space trimming function (fixes MT08552). osd/modules/input_dinput.cpp: Improved polling logic. osd: Made various parts of the input code less dependent on concrete emu objects, and reduced inappropriately passing around the machine object. Made input modules less dependent on OSD implementation. Encapsulated some stuff and got rid of some vestigial newui and SDL1 support code. Cleaned up some interfaces. Moved OSD options classes to their own files. Prepare to remove main.h from emu.h - it's mostly used to get the application name, which the vast majority of emulated devices don't need to do.
Diffstat (limited to 'src/osd/modules/midi')
-rw-r--r--src/osd/modules/midi/midi_module.h4
-rw-r--r--src/osd/modules/midi/none.cpp7
-rw-r--r--src/osd/modules/midi/portmidi.cpp4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/osd/modules/midi/midi_module.h b/src/osd/modules/midi/midi_module.h
index 8e64800622e..649d8f58b12 100644
--- a/src/osd/modules/midi/midi_module.h
+++ b/src/osd/modules/midi/midi_module.h
@@ -10,7 +10,6 @@
#pragma once
#include "osdepend.h"
-#include "modules/osdmodule.h"
#include <memory>
@@ -24,7 +23,8 @@
class midi_module
{
public:
- virtual ~midi_module() { }
+ virtual ~midi_module() = default;
+
// specific routines
virtual std::unique_ptr<osd_midi_device> create_midi_device() = 0;
diff --git a/src/osd/modules/midi/none.cpp b/src/osd/modules/midi/none.cpp
index 97333cb54de..232a5f1e2a3 100644
--- a/src/osd/modules/midi/none.cpp
+++ b/src/osd/modules/midi/none.cpp
@@ -8,10 +8,11 @@
***************************************************************************/
-#include "osdcore.h"
-#include "modules/osdmodule.h"
#include "midi_module.h"
+#include "modules/osdmodule.h"
+#include "osdcore.h"
+
#include <memory>
@@ -36,7 +37,7 @@ class none_module : public osd_module, public midi_module
public:
none_module() : osd_module(OSD_MIDI_PROVIDER, "none"), midi_module() { }
- virtual int init(const osd_options &options) override { return 0; }
+ virtual int init(osd_interface &osd, const osd_options &options) override { return 0; }
virtual void exit() override { }
virtual std::unique_ptr<osd_midi_device> create_midi_device() override;
diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp
index 4661779c0bd..dba61b47c77 100644
--- a/src/osd/modules/midi/portmidi.cpp
+++ b/src/osd/modules/midi/portmidi.cpp
@@ -33,7 +33,7 @@ public:
}
virtual ~pm_module() { }
- virtual int init(const osd_options &options)override;
+ virtual int init(osd_interface &osd, const osd_options &options) override;
virtual void exit() override;
virtual std::unique_ptr<osd_midi_device> create_midi_device() override;
@@ -73,7 +73,7 @@ std::unique_ptr<osd_midi_device> pm_module::create_midi_device()
}
-int pm_module::init(const osd_options &options)
+int pm_module::init(osd_interface &osd, const osd_options &options)
{
Pm_Initialize();
return 0;