Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

misc: Improve defaults for macOS and handling of missing audio backends. (#7273)

Browse source 
* misc: Improve backend defaults for macOS.

* audio_core: Improve handling of missing audio backends.
This commit is contained in:
Steveice10 2023-12-22 11:38:06 -08:00 • committed by GitHub
parent dccb8f6b17
commit 178e602589
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 109 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/citra_qt/CMakeLists.txt
View file

@ -351,10 +351,6 @@ if(UNIX AND NOT APPLE)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif()
if (NOT APPLE)
target_compile_definitions(citra-qt PRIVATE HAS_OPENGL)
endif()
if (CITRA_USE_PRECOMPILED_HEADERS)
target_precompile_headers(citra-qt PRIVATE precompiled_headers.h)
endif()

60
src/citra_qt/configuration/configure_audio.cpp
View file

@ -21,9 +21,10 @@ ConfigureAudio::ConfigureAudio(bool is_powered_on, QWidget* parent)
ui->setupUi(this);
ui->output_type_combo_box->clear();
for (u32 type = 0; type < static_cast<u32>(AudioCore::SinkType::NumSinkTypes); type++) {
ui->output_type_combo_box->addItem(QString::fromUtf8(
AudioCore::GetSinkName(static_cast<AudioCore::SinkType>(type)).data()));
ui->output_type_combo_box->addItem(tr("Auto"), QVariant::fromValue(AudioCore::SinkType::Auto));
for (const auto& sink : AudioCore::ListSinks()) {
ui->output_type_combo_box->addItem(QString::fromUtf8(sink.name),
QVariant::fromValue(sink.type));
}
ui->emulation_combo_box->setEnabled(!is_powered_on);
@ -32,9 +33,10 @@ ConfigureAudio::ConfigureAudio(bool is_powered_on, QWidget* parent)
&ConfigureAudio::SetVolumeIndicatorText);
ui->input_type_combo_box->clear();
for (u32 type = 0; type < static_cast<u32>(AudioCore::InputType::NumInputTypes); type++) {
ui->input_type_combo_box->addItem(QString::fromUtf8(
AudioCore::GetInputName(static_cast<AudioCore::InputType>(type)).data()));
ui->input_type_combo_box->addItem(tr("Auto"), QVariant::fromValue(AudioCore::InputType::Auto));
for (const auto& input : AudioCore::ListInputs()) {
ui->input_type_combo_box->addItem(QString::fromUtf8(input.name),
QVariant::fromValue(input.type));
}
ui->volume_label->setVisible(Settings::IsConfiguringGlobal());
@ -89,8 +91,18 @@ void ConfigureAudio::SetConfiguration() {
}
void ConfigureAudio::SetOutputTypeFromSinkType() {
ui->output_type_combo_box->setCurrentIndex(
static_cast<int>(Settings::values.output_type.GetValue()));
int new_index = -1;
for (int index = 0; index < ui->output_type_combo_box->count(); index++) {
const auto sink_type =
static_cast<AudioCore::SinkType>(ui->output_type_combo_box->itemData(index).toUInt());
if (Settings::values.output_type.GetValue() == sink_type) {
new_index = index;
break;
}
}
ui->output_type_combo_box->setCurrentIndex(new_index);
}
void ConfigureAudio::SetOutputDeviceFromDeviceID() {
@ -108,8 +120,18 @@ void ConfigureAudio::SetOutputDeviceFromDeviceID() {
}
void ConfigureAudio::SetInputTypeFromInputType() {
ui->input_type_combo_box->setCurrentIndex(
static_cast<int>(Settings::values.input_type.GetValue()));
int new_index = -1;
for (int index = 0; index < ui->input_type_combo_box->count(); index++) {
const auto input_type =
static_cast<AudioCore::InputType>(ui->input_type_combo_box->itemData(index).toUInt());
if (Settings::values.input_type.GetValue() == input_type) {
new_index = index;
break;
}
}
ui->input_type_combo_box->setCurrentIndex(new_index);
}
void ConfigureAudio::SetInputDeviceFromDeviceID() {
@ -142,30 +164,34 @@ void ConfigureAudio::ApplyConfiguration() {
if (Settings::IsConfiguringGlobal()) {
Settings::values.output_type =
static_cast<AudioCore::SinkType>(ui->output_type_combo_box->currentIndex());
static_cast<AudioCore::SinkType>(ui->output_type_combo_box->currentData().toUInt());
Settings::values.output_device = ui->output_device_combo_box->currentText().toStdString();
Settings::values.input_type =
static_cast<AudioCore::InputType>(ui->input_type_combo_box->currentIndex());
static_cast<AudioCore::InputType>(ui->input_type_combo_box->currentData().toUInt());
Settings::values.input_device = ui->input_device_combo_box->currentText().toStdString();
}
}
void ConfigureAudio::UpdateAudioOutputDevices(int sink_index) {
auto sink_type = static_cast<AudioCore::SinkType>(sink_index);
auto sink_type =
static_cast<AudioCore::SinkType>(ui->output_type_combo_box->itemData(sink_index).toUInt());
auto& sink_details = AudioCore::GetSinkDetails(sink_type);
ui->output_device_combo_box->clear();
ui->output_device_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name));
for (const auto& device : AudioCore::GetDeviceListForSink(sink_type)) {
for (const auto& device : sink_details.list_devices()) {
ui->output_device_combo_box->addItem(QString::fromStdString(device));
}
}
void ConfigureAudio::UpdateAudioInputDevices(int input_index) {
auto input_type = static_cast<AudioCore::InputType>(input_index);
auto input_type =
static_cast<AudioCore::InputType>(ui->input_type_combo_box->itemData(input_index).toUInt());
auto& input_details = AudioCore::GetInputDetails(input_type);
#if defined(__APPLE__)
if (input_type != AudioCore::InputType::Null && input_type != AudioCore::InputType::Static) {
if (input_details.real) {
AppleAuthorization::CheckAuthorizationForMicrophone();
}
#endif
@ -173,7 +199,7 @@ void ConfigureAudio::UpdateAudioInputDevices(int input_index) {
ui->input_device_combo_box->clear();
ui->input_device_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name));
for (const auto& device : AudioCore::GetDeviceListForInput(input_type)) {
for (const auto& device : input_details.list_devices()) {
ui->input_device_combo_box->addItem(QString::fromStdString(device));
}
}