summaryrefslogtreecommitdiffstats
path: root/src/devices/imagedev/midiout.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
commitd1681a8ecef978ee34bafe24e95d34f25581e9c3 (patch)
tree958f96e617f2b5cb3c7c74536a14ad19d9a45be7 /src/devices/imagedev/midiout.cpp
parentb7de847b6e5f259fa5c67b43951586204a6ae387 (diff)
parent9ac531e2b9aa690910cbeb35a14bd93fb001592b (diff)
Merge remote-tracking branch 'upstream/master' into master
Diffstat (limited to 'src/devices/imagedev/midiout.cpp')
-rw-r--r--src/devices/imagedev/midiout.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp
index 3c0613e2015..e9551a50d17 100644
--- a/src/devices/imagedev/midiout.cpp
+++ b/src/devices/imagedev/midiout.cpp
@@ -26,7 +26,7 @@ midiout_device::midiout_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, MIDIOUT, tag, owner, clock),
device_image_interface(mconfig, *this),
device_serial_interface(mconfig, *this),
- m_midi(nullptr)
+ m_midi()
{
}
@@ -36,7 +36,7 @@ midiout_device::midiout_device(const machine_config &mconfig, const char *tag, d
void midiout_device::device_start()
{
- m_midi = nullptr;
+ m_midi.reset();
}
void midiout_device::device_reset()
@@ -51,14 +51,13 @@ void midiout_device::device_reset()
call_load
-------------------------------------------------*/
-image_init_result midiout_device::call_load(void)
+image_init_result midiout_device::call_load()
{
m_midi = machine().osd().create_midi_device();
if (!m_midi->open_output(filename()))
{
- global_free(m_midi);
- m_midi = nullptr;
+ m_midi.reset();
return image_init_result::FAIL;
}
@@ -69,13 +68,12 @@ image_init_result midiout_device::call_load(void)
call_unload
-------------------------------------------------*/
-void midiout_device::call_unload(void)
+void midiout_device::call_unload()
{
if (m_midi)
{
m_midi->close();
- global_free(m_midi);
- m_midi = nullptr;
+ m_midi.reset();
}
}