Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review comments

Browse source
This commit is contained in:
James Rowe 2019-03-06 11:16:43 -07:00
parent c669aa8d55
commit 5f532c2560
11 changed files with 119 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/citra_qt/configuration/config.cpp
View file

@ -198,7 +198,8 @@ void Config::ReadValues() {
Settings::values.audio_device_id =
ReadSetting("output_device", "auto").toString().toStdString();
Settings::values.volume = ReadSetting("volume", 1).toFloat();
Settings::values.mic_input_type = ReadSetting("mic_input_type", 0).toInt();
Settings::values.mic_input_type =
static_cast<Settings::MicInputType>(ReadSetting("mic_input_type", 0).toInt());
Settings::values.mic_input_device =
ReadSetting("mic_input_device", "Default").toString().toStdString();
qt_config->endGroup();
@ -483,8 +484,8 @@ void Config::SaveValues() {
WriteSetting("enable_audio_stretching", Settings::values.enable_audio_stretching, true);
WriteSetting("output_device", QString::fromStdString(Settings::values.audio_device_id), "auto");
WriteSetting("volume", Settings::values.volume, 1.0f);
WriteSetting("mic_input_device", QString::fromStdString(Settings::values.mic_input_device), 0);
WriteSetting("mic_input_type", Settings::values.mic_input_type, "Default");
WriteSetting("mic_input_device", QString::fromStdString(Settings::values.mic_input_device), "Default");
WriteSetting("mic_input_type", static_cast<int>(Settings::values.mic_input_type), 0);
qt_config->endGroup();
using namespace Service::CAM;

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

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <memory>
#include <QAudioDeviceInfo>
#include <QtGlobal>
#include "audio_core/cubeb_input.h"
#include "audio_core/sink.h"
@ -37,14 +36,14 @@ ConfigureAudio::ConfigureAudio(QWidget* parent)
ui->input_device_combo_box->addItem(QString::fromStdString(device));
}
connect(ui->input_type_combo_box, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
connect(ui->input_type_combo_box, qOverload<int>(&QComboBox::currentIndexChanged), this,
&ConfigureAudio::updateAudioInputDevices);
ui->input_type_combo_box->setEnabled(!Core::System::GetInstance().IsPoweredOn());
ui->input_device_combo_box->setEnabled(!Core::System::GetInstance().IsPoweredOn());
this->setConfiguration();
connect(ui->output_sink_combo_box, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
connect(ui->output_sink_combo_box, qOverload<int>(&QComboBox::currentIndexChanged), this,
&ConfigureAudio::updateAudioOutputDevices);
}
@ -74,10 +73,11 @@ void ConfigureAudio::setConfiguration() {
}
ui->emulation_combo_box->setCurrentIndex(selection);
ui->input_type_combo_box->setCurrentIndex(Settings::values.mic_input_type);
int index = static_cast<int>(Settings::values.mic_input_type);
ui->input_type_combo_box->setCurrentIndex(index);
ui->input_device_combo_box->setCurrentText(
QString::fromStdString(Settings::values.mic_input_device));
updateAudioInputDevices(Settings::values.mic_input_type);
updateAudioInputDevices(index);
}
void ConfigureAudio::setOutputSinkFromSinkID() {
@ -124,7 +124,8 @@ void ConfigureAudio::applyConfiguration() {
static_cast<float>(ui->volume_slider->sliderPosition()) / ui->volume_slider->maximum();
Settings::values.enable_dsp_lle = ui->emulation_combo_box->currentIndex() != 0;
Settings::values.enable_dsp_lle_multithread = ui->emulation_combo_box->currentIndex() == 2;
Settings::values.mic_input_type = ui->input_type_combo_box->currentIndex();
Settings::values.mic_input_type =
static_cast<Settings::MicInputType>(ui->input_type_combo_box->currentIndex());
Settings::values.mic_input_device = ui->input_device_combo_box->currentText().toStdString();
}