diff options
| author | 2019-05-19 11:08:54 -0400 | |
|---|---|---|
| committer | 2019-05-19 11:08:56 -0400 | |
| commit | d184224e8fceee33ac4ab188b8acb75d1a5208b4 (patch) | |
| tree | 5a72e8515dfb0552d72633f8b2170239c6a67e89 /src | |
| parent | Merge pull request #2463 from lioncash/set (diff) | |
| download | yuzu-d184224e8fceee33ac4ab188b8acb75d1a5208b4.tar.gz yuzu-d184224e8fceee33ac4ab188b8acb75d1a5208b4.tar.xz yuzu-d184224e8fceee33ac4ab188b8acb75d1a5208b4.zip | |
yuzu/configuration/configure_audio: Specify string conversions explicitly
Allows the audio configuration code to build with implicit string
conversions disabled.
Diffstat (limited to 'src')
| -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) | |||
| 16 | ui->setupUi(this); | 16 | ui->setupUi(this); |
| 17 | 17 | ||
| 18 | ui->output_sink_combo_box->clear(); | 18 | ui->output_sink_combo_box->clear(); |
| 19 | ui->output_sink_combo_box->addItem("auto"); | 19 | ui->output_sink_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name)); |
| 20 | for (const char* id : AudioCore::GetSinkIDs()) { | 20 | for (const char* id : AudioCore::GetSinkIDs()) { |
| 21 | ui->output_sink_combo_box->addItem(id); | 21 | ui->output_sink_combo_box->addItem(QString::fromUtf8(id)); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | connect(ui->volume_slider, &QSlider::valueChanged, this, | 24 | connect(ui->volume_slider, &QSlider::valueChanged, this, |
| @@ -94,7 +94,7 @@ void ConfigureAudio::applyConfiguration() { | |||
| 94 | 94 | ||
| 95 | void ConfigureAudio::updateAudioDevices(int sink_index) { | 95 | void ConfigureAudio::updateAudioDevices(int sink_index) { |
| 96 | ui->audio_device_combo_box->clear(); | 96 | ui->audio_device_combo_box->clear(); |
| 97 | ui->audio_device_combo_box->addItem(AudioCore::auto_device_name); | 97 | ui->audio_device_combo_box->addItem(QString::fromUtf8(AudioCore::auto_device_name)); |
| 98 | 98 | ||
| 99 | const std::string sink_id = ui->output_sink_combo_box->itemText(sink_index).toStdString(); | 99 | const std::string sink_id = ui->output_sink_combo_box->itemText(sink_index).toStdString(); |
| 100 | for (const auto& device : AudioCore::GetDeviceListForSink(sink_id)) { | 100 | for (const auto& device : AudioCore::GetDeviceListForSink(sink_id)) { |