f852369986
* Initial Commit Added Device logic to Sinks Started on UI for selecting devices Removed redundant import * Audio Core: Complete Device Switching Complete the device switching implementation by allowing the output device to be loaded, changed and saved through the configurations menu. Worked with the Sink abstraction and tuned the "Device Selection" configuration so that the Device List is automatically populated when the Sink is changed. This hopefully addresses the concerns and recommendations mentioned in the comments of the PR. * Clean original implementation. * Refactor GetSinkDetails
77 lines
2.7 KiB
C++
77 lines
2.7 KiB
C++
// Copyright 2016 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <memory>
|
|
#include "audio_core/audio_core.h"
|
|
#include "audio_core/sink.h"
|
|
#include "audio_core/sink_details.h"
|
|
#include "citra_qt/configure_audio.h"
|
|
#include "core/settings.h"
|
|
#include "ui_configure_audio.h"
|
|
|
|
ConfigureAudio::ConfigureAudio(QWidget* parent)
|
|
: QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) {
|
|
ui->setupUi(this);
|
|
|
|
ui->output_sink_combo_box->clear();
|
|
ui->output_sink_combo_box->addItem("auto");
|
|
for (const auto& sink_detail : AudioCore::g_sink_details) {
|
|
ui->output_sink_combo_box->addItem(sink_detail.id);
|
|
}
|
|
|
|
this->setConfiguration();
|
|
connect(ui->output_sink_combo_box, SIGNAL(currentIndexChanged(int)), this,
|
|
SLOT(updateAudioDevices(int)));
|
|
}
|
|
|
|
ConfigureAudio::~ConfigureAudio() {}
|
|
|
|
void ConfigureAudio::setConfiguration() {
|
|
int new_sink_index = 0;
|
|
for (int index = 0; index < ui->output_sink_combo_box->count(); index++) {
|
|
if (ui->output_sink_combo_box->itemText(index).toStdString() == Settings::values.sink_id) {
|
|
new_sink_index = index;
|
|
break;
|
|
}
|
|
}
|
|
ui->output_sink_combo_box->setCurrentIndex(new_sink_index);
|
|
|
|
ui->toggle_audio_stretching->setChecked(Settings::values.enable_audio_stretching);
|
|
|
|
// The device list cannot be pre-populated (nor listed) until the output sink is known.
|
|
updateAudioDevices(new_sink_index);
|
|
|
|
int new_device_index = -1;
|
|
for (int index = 0; index < ui->audio_device_combo_box->count(); index++) {
|
|
if (ui->audio_device_combo_box->itemText(index).toStdString() ==
|
|
Settings::values.audio_device_id) {
|
|
new_device_index = index;
|
|
break;
|
|
}
|
|
}
|
|
ui->audio_device_combo_box->setCurrentIndex(new_device_index);
|
|
}
|
|
|
|
void ConfigureAudio::applyConfiguration() {
|
|
Settings::values.sink_id =
|
|
ui->output_sink_combo_box->itemText(ui->output_sink_combo_box->currentIndex())
|
|
.toStdString();
|
|
Settings::values.enable_audio_stretching = ui->toggle_audio_stretching->isChecked();
|
|
Settings::values.audio_device_id =
|
|
ui->audio_device_combo_box->itemText(ui->audio_device_combo_box->currentIndex())
|
|
.toStdString();
|
|
Settings::Apply();
|
|
}
|
|
|
|
void ConfigureAudio::updateAudioDevices(int sink_index) {
|
|
ui->audio_device_combo_box->clear();
|
|
ui->audio_device_combo_box->addItem("auto");
|
|
|
|
std::string sink_id = ui->output_sink_combo_box->itemText(sink_index).toStdString();
|
|
std::vector<std::string> device_list =
|
|
AudioCore::GetSinkDetails(sink_id).factory()->GetDeviceList();
|
|
for (const auto& device : device_list) {
|
|
ui->audio_device_combo_box->addItem(device.c_str());
|
|
}
|
|
}
|