CubebInput: Avoid redundant CoInitializeEx (#449)

cemu-project · Nov 3, 2022 · a40b226 · a40b226
1 parent 521f2fb
commit a40b226
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git 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<IAudioInputAPI::DeviceDescriptionPtr> CubebInputAPI::GetDevices()

diff --git a/src/audio/CubebInputAPI.h b/src/audio/CubebInputAPI.h
@@ -40,7 +40,6 @@ class CubebInputAPI : public IAudioInputAPI
 	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
@@ -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);