diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-05-19 11:08:54 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-05-19 11:08:56 -0400 |
| commit | d184224e8fceee33ac4ab188b8acb75d1a5208b4 (patch) | |
| tree | 5a72e8515dfb0552d72633f8b2170239c6a67e89 /src/yuzu/configuration/configure_audio.cpp | |
| parent | 594328f4946e4c1b347a308c0888c399cd74d4f2 (diff) | |
yuzu/configuration/configure_audio: Specify string conversions explicitly
Allows the audio configuration code to build with implicit string
conversions disabled.
Diffstat (limited to 'src/yuzu/configuration/configure_audio.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_audio.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 5d9ccc6e8..a407011f0 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -16,9 +16,9 @@ ConfigureAudio::ConfigureAudio(QWidget* parent) ui->setupUi(this); ui->output_sink_combo_box->clear(); - ui->output_sink_combo_box->addItem("auto"); + ui->output_sink_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name)); for (const char* id : AudioCore::GetSinkIDs()) { - ui->output_sink_combo_box->addItem(id); + ui->output_sink_combo_box->addItem(QString::fromUtf8(id)); } connect(ui->volume_slider, &QSlider::valueChanged, this, @@ -94,7 +94,7 @@ void ConfigureAudio::applyConfiguration() { void ConfigureAudio::updateAudioDevices(int sink_index) { ui->audio_device_combo_box->clear(); - ui->audio_device_combo_box->addItem(AudioCore::auto_device_name); + ui->audio_device_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name)); const std::string sink_id = ui->output_sink_combo_box->itemText(sink_index).toStdString(); for (const auto& device : AudioCore::GetDeviceListForSink(sink_id)) { |