From 927f1e03a3e53879e737a1696c4b226aa4017418 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Mar 2021 14:02:16 +0100 Subject: [PATCH] win32/Com: make COINIT_APARTMENTTHREADED the default constructor --- src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 2 +- src/win32/Com.hxx | 2 +- src/win32/ComWorker.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx index f49d9748b..a0c08008f 100644 --- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx +++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx @@ -307,7 +307,7 @@ IAudioClient *wasapi_output_get_client(WasapiOutput &output) noexcept { void WasapiOutputThread::Work() noexcept { SetThreadName("Wasapi Output Worker"); FormatDebug(wasapi_output_domain, "Working thread started"); - COM com{true}; + COM com; while (true) { try { event.Wait(); diff --git a/src/win32/Com.hxx b/src/win32/Com.hxx index 284fca5ea..ba749a8c1 100644 --- a/src/win32/Com.hxx +++ b/src/win32/Com.hxx @@ -28,7 +28,7 @@ // https://docs.microsoft.com/en-us/windows/win32/api/_com/ class COM { public: - COM(bool) { + COM() { if (HRESULT result = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); FAILED(result)) { throw MakeHResultError( diff --git a/src/win32/ComWorker.cxx b/src/win32/ComWorker.cxx index 5de211071..c5ada8c91 100644 --- a/src/win32/ComWorker.cxx +++ b/src/win32/ComWorker.cxx @@ -25,7 +25,7 @@ void COMWorker::Work() noexcept { SetThreadName("COM Worker"); - COM com{true}; + COM com; while (true) { if (!running_flag.test_and_set()) { return;