ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: fix memory leak on midi error

This commit is contained in:
Megamouse 2023-05-18 21:48:21 +02:00
parent 5a4206e05d
commit 8db318094f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpcs3/rpcs3qt/midi_creator.cpp
View File

@ -23,10 +23,11 @@ void midi_creator::refresh_list()
m_midi_list.clear(); m_midi_list.clear();
m_midi_list.append(get_none()); m_midi_list.append(get_none());
RtMidiInPtr midi_in = rtmidi_in_create_default(); const auto deleter = [](RtMidiWrapper* ptr) { if (ptr) rtmidi_in_free(ptr); };
std::unique_ptr<RtMidiWrapper, decltype(deleter)> midi_in(rtmidi_in_create_default());
ensure(midi_in); ensure(midi_in);
cfg_log.notice("MIDI: Using %s api", rtmidi_api_name(rtmidi_in_get_current_api(midi_in))); cfg_log.notice("MIDI: Using %s api", rtmidi_api_name(rtmidi_in_get_current_api(midi_in.get())));
if (!midi_in->ok) if (!midi_in->ok)
{ {
@ -34,7 +35,7 @@ void midi_creator::refresh_list()
return; return;
} }
const s32 port_count = rtmidi_get_port_count(midi_in); const s32 port_count = rtmidi_get_port_count(midi_in.get());
if (port_count == -1) if (port_count == -1)
{ {
@ -46,7 +47,7 @@ void midi_creator::refresh_list()
{ {
char buf[128]{}; char buf[128]{};
s32 size = sizeof(buf); s32 size = sizeof(buf);
if (rtmidi_get_port_name(midi_in, port_number, buf, &size) == -1) if (rtmidi_get_port_name(midi_in.get(), port_number, buf, &size) == -1)
{ {
cfg_log.error("Error getting midi port name for port %d: %s", port_number, midi_in->msg); cfg_log.error("Error getting midi port name for port %d: %s", port_number, midi_in->msg);
continue; continue;
@ -55,8 +56,6 @@ void midi_creator::refresh_list()
cfg_log.notice("Found midi device with name: %s", buf); cfg_log.notice("Found midi device with name: %s", buf);
m_midi_list.append(QString::fromUtf8(buf)); m_midi_list.append(QString::fromUtf8(buf));
} }
rtmidi_in_free(midi_in);
} }
QStringList midi_creator::get_midi_list() const QStringList midi_creator::get_midi_list() const