fix: force quit miniaudio thread after 1s (#5896)

This commit is contained in:
pajlada
2025-02-03 00:19:04 +01:00
committed by GitHub
parent da0a247f16
commit 0c489e0033
3 changed files with 19 additions and 5 deletions
+16 -5
View File
@@ -14,6 +14,7 @@
#define MINIAUDIO_IMPLEMENTATION
#include <miniaudio.h>
#include <QFile>
#include <QScopeGuard>
#include <limits>
#include <memory>
@@ -192,6 +193,10 @@ MiniaudioBackend::MiniaudioBackend()
});
this->audioThread = std::make_unique<std::thread>([this] {
auto guard = qScopeGuard([&] {
this->stoppedFlag.set();
});
this->ioContext.run();
});
renameThread(*this->audioThread, "C2Miniaudio");
@@ -218,14 +223,20 @@ MiniaudioBackend::~MiniaudioBackend()
this->workGuard.reset();
});
if (this->audioThread->joinable())
{
this->audioThread->join();
}
else
if (!this->audioThread->joinable())
{
qCWarning(chatterinoSound) << "Audio thread not joinable";
return;
}
if (this->stoppedFlag.waitFor(std::chrono::seconds{1}))
{
this->audioThread->join();
return;
}
qCWarning(chatterinoSound) << "Audio thread did not stop within 1 second";
this->audioThread->detach();
}
void MiniaudioBackend::play(const QUrl &sound)
@@ -1,6 +1,7 @@
#pragma once
#include "controllers/sound/ISoundController.hpp"
#include "util/OnceFlag.hpp"
#include "util/ThreadGuard.hpp"
#include <boost/asio.hpp>
@@ -59,6 +60,7 @@ private:
boost::asio::executor_work_guard<boost::asio::io_context::executor_type>
workGuard;
std::unique_ptr<std::thread> audioThread;
OnceFlag stoppedFlag;
boost::asio::steady_timer sleepTimer;
bool initialized{false};