From a40b226e003b7ad6a21612f6a1a72ba09f102faa Mon Sep 17 00:00:00 2001 From: Exzap <13877693+Exzap@users.noreply.github.com> Date: Thu, 3 Nov 2022 18:29:21 +0100 Subject: [PATCH] CubebInput: Avoid redundant CoInitializeEx (#449) --- src/audio/CubebInputAPI.cpp | 17 ----------------- src/audio/CubebInputAPI.h | 1 - src/gui/GeneralSettings2.cpp | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/audio/CubebInputAPI.cpp b/src/audio/CubebInputAPI.cpp index f22a541a..21b6c8d0 100644 --- a/src/audio/CubebInputAPI.cpp +++ b/src/audio/CubebInputAPI.cpp @@ -158,22 +158,9 @@ void CubebInputAPI::SetVolume(sint32 volume) bool CubebInputAPI::InitializeStatic() { -#if BOOST_OS_WINDOWS - s_com_initialized = (SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED))); -#endif - if (cubeb_init(&s_context, "Cemu Input Cubeb", nullptr)) { cemuLog_force("can't create cubeb audio api"); - -#if BOOST_OS_WINDOWS - if (s_com_initialized) - { - CoUninitialize(); - s_com_initialized = false; - } -#endif - return false; } @@ -184,10 +171,6 @@ void CubebInputAPI::Destroy() { if (s_context) cubeb_destroy(s_context); -#if BOOST_OS_WINDOWS - if (s_com_initialized) - CoUninitialize(); -#endif } std::vector CubebInputAPI::GetDevices() diff --git a/src/audio/CubebInputAPI.h b/src/audio/CubebInputAPI.h index a794c9ba..82be3c6b 100644 --- a/src/audio/CubebInputAPI.h +++ b/src/audio/CubebInputAPI.h @@ -40,7 +40,6 @@ public: static void Destroy(); private: - inline static bool s_com_initialized = false; inline static cubeb* s_context = nullptr; cubeb_stream* m_stream = nullptr; diff --git a/src/gui/GeneralSettings2.cpp b/src/gui/GeneralSettings2.cpp index 0216a080..013311a2 100644 --- a/src/gui/GeneralSettings2.cpp +++ b/src/gui/GeneralSettings2.cpp @@ -436,7 +436,7 @@ wxPanel* GeneralSettings2::AddAudioPage(wxNotebook* notebook) } { - auto box = new wxStaticBox(audio_panel, wxID_ANY, _("Microphone")); + auto box = new wxStaticBox(audio_panel, wxID_ANY, _("Microphone (Experimental)")); auto box_sizer = new wxStaticBoxSizer(box, wxVERTICAL); auto audio_input_row = new wxFlexGridSizer(0, 3, 0, 0);