summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/midiin.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
committer ImJezze <jezze@gmx.net>2015-12-13 11:23:55 +0100
commit4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch)
treedf0e1d28daa79b9151088498a933cd1fc37c9c07 /src/devices/imagedev/midiin.cpp
parent1cda42b22e591965ee69561fcf52272bd991b3b2 (diff)
parent14d5966a379e9783ba724750a5f84a72af62cadc (diff)
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/imagedev/midiin.cpp')
-rw-r--r--src/devices/imagedev/midiin.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp
index 3f2c22d7c99..ae5bdb81eb8 100644
--- a/src/devices/imagedev/midiin.cpp
+++ b/src/devices/imagedev/midiin.cpp
@@ -24,14 +24,14 @@ const device_type MIDIIN = &device_creator<midiin_device>;
midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MIDIIN, "MIDI In image device", tag, owner, clock, "midiin", __FILE__),
- device_image_interface(mconfig, *this),
- device_serial_interface(mconfig, *this),
- m_midi(NULL),
- m_timer(NULL),
- m_input_cb(*this),
- m_xmit_read(0),
- m_xmit_write(0),
- m_tx_busy(false)
+ device_image_interface(mconfig, *this),
+ device_serial_interface(mconfig, *this),
+ m_midi(nullptr),
+ m_timer(nullptr),
+ m_input_cb(*this),
+ m_xmit_read(0),
+ m_xmit_write(0),
+ m_tx_busy(false)
{
}
@@ -43,7 +43,7 @@ void midiin_device::device_start()
{
m_input_cb.resolve_safe();
m_timer = timer_alloc(0);
- m_midi = NULL;
+ m_midi = nullptr;
m_timer->enable(false);
}
@@ -81,7 +81,7 @@ void midiin_device::device_timer(emu_timer &timer, device_timer_id id, int param
UINT8 buf[8192*4];
int bytesRead;
- if (m_midi == NULL) {
+ if (m_midi == nullptr) {
return;
}
@@ -110,7 +110,7 @@ bool midiin_device::call_load(void)
if (!m_midi->open_input(filename()))
{
global_free(m_midi);
- m_midi = NULL;
+ m_midi = nullptr;
return IMAGE_INIT_FAIL;
}
@@ -131,7 +131,7 @@ void midiin_device::call_unload(void)
global_free(m_midi);
}
m_timer->enable(false);
- m_midi = NULL;
+ m_midi = nullptr;
}
void midiin_device::tra_complete()