From 095716fa21071a506605304db6a113f231ff0dcd Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 9 Nov 2023 20:17:16 -0500 Subject: Fix lingering notes with newer fluidsynth versions. --- core/qmpmidiplay.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'core/qmpmidiplay.cpp') diff --git a/core/qmpmidiplay.cpp b/core/qmpmidiplay.cpp index c3c52ca..113045f 100644 --- a/core/qmpmidiplay.cpp +++ b/core/qmpmidiplay.cpp @@ -189,7 +189,7 @@ SEvent *CMidiPlayer::getEvent(uint32_t id) } void CMidiPlayer::prePlayInit() { - playerPanic(true); + playerReset(); for (size_t i = 0; i < mididev.size(); ++i) if (mididev[i].refcnt) mididev[i].dev->reset(0xFF); @@ -382,16 +382,21 @@ CMidiPlayer::~CMidiPlayer() delete midiFile; delete midiReaders; } -void CMidiPlayer::playerPanic(bool reset) +void CMidiPlayer::playerReset() { for (auto &i : mididev) if (i.refcnt) { - if (reset) - i.dev->reset(0xff); - else - for (uint8_t j = 0; j < 16; ++j) - i.dev->panic(j); + i.dev->reset(0xff); + } +} +void CMidiPlayer::playerPanic() +{ + for (auto &i : mididev) + if (i.refcnt) + { + for (uint8_t j = 0; j < 16; ++j) + i.dev->panic(j); } } bool CMidiPlayer::playerLoadFile(const char *fn) -- cgit v1.2.3