From a4914ceb5c96e65b2923f2dcf414d7a7f7ccd92b Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 7 Jan 2021 20:34:34 +0800 Subject: new_fluid_audio_driver2 doesn't work for any audio drivers available on Windows. whoops. another opportunity to inject my crappy code into fluidsynth though. --- core/qmpmidioutfluid.cpp | 5 +++++ qmidiplayer-desktop/qmpmainwindow.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/qmpmidioutfluid.cpp b/core/qmpmidioutfluid.cpp index 22f4aa2..621840e 100644 --- a/core/qmpmidioutfluid.cpp +++ b/core/qmpmidioutfluid.cpp @@ -84,6 +84,11 @@ void qmpMidiOutFluid::deviceInit() } , this); if (!adriver) + { + adriver = new_fluid_audio_driver(settings, synth); + output_level = 1e9 + 7; + } + if (!adriver) { fputs("Error creating fluidsynth audio driver!", stderr); delete_fluid_synth(synth); diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp index 1c825ee..1198559 100644 --- a/qmidiplayer-desktop/qmpmainwindow.cpp +++ b/qmidiplayer-desktop/qmpmainwindow.cpp @@ -379,7 +379,7 @@ void qmpMainWindow::switchTrack(QString s, bool interrupt) { player->playerThread(); if (settings->getOptionBool("Midi/WaitVoice") && player->isFinished()) - while (internalfluid->getOutputLevel() > -100) + while (internalfluid->getOutputLevel() > -100 && internalfluid->getPolyphone() > 0) std::this_thread::sleep_for(std::chrono::milliseconds(10)); }); #ifdef _WIN32 @@ -534,7 +534,7 @@ void qmpMainWindow::on_pbPlayPause_clicked() { player->playerThread(); if (settings->getOptionBool("Midi/WaitVoice") && player->isFinished()) - while (internalfluid->getOutputLevel() > -100) + while (internalfluid->getOutputLevel() > -100 && internalfluid->getPolyphone() > 0) std::this_thread::sleep_for(std::chrono::milliseconds(10)); }); #ifdef _WIN32 -- cgit v1.2.3