diff options
author | 2020-10-03 14:31:39 +1000 | |
---|---|---|
committer | 2020-10-03 14:31:39 +1000 | |
commit | d1681a8ecef978ee34bafe24e95d34f25581e9c3 (patch) | |
tree | 958f96e617f2b5cb3c7c74536a14ad19d9a45be7 /src/osd/modules/midi/portmidi.cpp | |
parent | b7de847b6e5f259fa5c67b43951586204a6ae387 (diff) | |
parent | 9ac531e2b9aa690910cbeb35a14bd93fb001592b (diff) |
Merge remote-tracking branch 'upstream/master' into master
Diffstat (limited to 'src/osd/modules/midi/portmidi.cpp')
-rw-r--r-- | src/osd/modules/midi/portmidi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp index 64f71ca6689..9deca98ea2d 100644 --- a/src/osd/modules/midi/portmidi.cpp +++ b/src/osd/modules/midi/portmidi.cpp @@ -29,7 +29,7 @@ public: virtual int init(const osd_options &options)override; virtual void exit()override; - virtual osd_midi_device *create_midi_device() override; + virtual std::unique_ptr<osd_midi_device> create_midi_device() override; virtual void list_midi_devices() override; }; @@ -60,9 +60,9 @@ private: bool rx_sysex; }; -osd_midi_device *pm_module::create_midi_device() +std::unique_ptr<osd_midi_device> pm_module::create_midi_device() { - return global_alloc(osd_midi_device_pm()); + return std::make_unique<osd_midi_device_pm>(); } |