Merge generic part of Android microphone changes (#5624)

This commit is contained in:
xperia64 2020-12-31 00:21:03 +00:00 committed by GitHub
parent e6ef00b41d
commit 5f1eb7146d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 9 deletions

View file

@ -3,9 +3,6 @@
// Refer to the license.txt file included.
#include <boost/serialization/weak_ptr.hpp>
#ifdef HAVE_CUBEB
#include "audio_core/cubeb_input.h"
#endif
#include "common/archives.h"
#include "common/logging/log.h"
#include "core/core.h"
@ -359,11 +356,7 @@ struct MIC_U::Impl {
new_mic = std::make_unique<Frontend::Mic::NullMic>();
break;
case Settings::MicInputType::Real:
#if HAVE_CUBEB
new_mic = std::make_unique<AudioCore::CubebInput>(Settings::values.mic_input_device);
#else
new_mic = std::make_unique<Frontend::Mic::NullMic>();
#endif
new_mic = Frontend::Mic::CreateRealMic(Settings::values.mic_input_device);
break;
case Settings::MicInputType::Static:
new_mic = std::make_unique<Frontend::Mic::StaticMic>();