mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::unique_ptr over calloc

pull/13377/head
Rubidium 2025-01-16 17:46:10 +01:00 committed by rubidium42
parent b7a82819de
commit f8566c3ff1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/music/win32_m.cpp
View File

@ -64,7 +64,7 @@ void CALLBACK MidiOutProc(HMIDIOUT hmo, UINT wMsg, DWORD_PTR, DWORD_PTR dwParam1
if (wMsg == MOM_DONE) { if (wMsg == MOM_DONE) {
MIDIHDR *hdr = (LPMIDIHDR)dwParam1; MIDIHDR *hdr = (LPMIDIHDR)dwParam1;
midiOutUnprepareHeader(hmo, hdr, sizeof(*hdr)); midiOutUnprepareHeader(hmo, hdr, sizeof(*hdr));
free(hdr); delete hdr;
} }
} }
@ -81,15 +81,13 @@ static void TransmitSysex(const uint8_t *&msg_start, size_t &remaining)
msg_end++; /* also include sysex end byte */ msg_end++; /* also include sysex end byte */
/* prepare header */ /* prepare header */
MIDIHDR *hdr = CallocT<MIDIHDR>(1); auto hdr = std::make_unique<MIDIHDR>();
hdr->lpData = reinterpret_cast<LPSTR>(const_cast<uint8_t *>(msg_start)); hdr->lpData = reinterpret_cast<LPSTR>(const_cast<uint8_t *>(msg_start));
hdr->dwBufferLength = msg_end - msg_start; hdr->dwBufferLength = static_cast<DWORD>(msg_end - msg_start);
if (midiOutPrepareHeader(_midi.midi_out, hdr, sizeof(*hdr)) == MMSYSERR_NOERROR) { if (midiOutPrepareHeader(_midi.midi_out, hdr.get(), sizeof(MIDIHDR)) == MMSYSERR_NOERROR) {
/* transmit - just point directly into the data buffer */ /* transmit - just point directly into the data buffer */
hdr->dwBytesRecorded = hdr->dwBufferLength; hdr->dwBytesRecorded = hdr->dwBufferLength;
midiOutLongMsg(_midi.midi_out, hdr, sizeof(*hdr)); midiOutLongMsg(_midi.midi_out, hdr.release(), sizeof(MIDIHDR));
} else {
free(hdr);
} }
/* update position in buffer */ /* update position in buffer */