octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3831 from FearlessTobi/add-volume-slider

Browse Source 
citra_qt: Add a volume slider
This commit is contained in:
James Rowe
2018-07-18 09:56:47 -06:00
committed by GitHub
parent a1b1d827bf 6eb7ee99cd
commit 2f8c9c8126
9 changed files with 110 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/citra_qt/configuration/configure_audio.cpp
View File

@ -19,6 +19,10 @@ ConfigureAudio::ConfigureAudio(QWidget* parent)
ui->output_sink_combo_box->addItem(sink_detail.id);
}
connect(ui->volume_slider, &QSlider::valueChanged, [this] {
ui->volume_indicator->setText(tr("%1 %").arg(ui->volume_slider->sliderPosition()));
});
this->setConfiguration();
connect(ui->output_sink_combo_box,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
@ -51,6 +55,9 @@ void ConfigureAudio::setConfiguration() {
}
}
ui->audio_device_combo_box->setCurrentIndex(new_device_index);
ui->volume_slider->setValue(Settings::values.volume * ui->volume_slider->maximum());
ui->volume_indicator->setText(tr("%1 %").arg(ui->volume_slider->sliderPosition()));
}
void ConfigureAudio::applyConfiguration() {
@ -61,6 +68,8 @@ void ConfigureAudio::applyConfiguration() {
Settings::values.audio_device_id =
ui->audio_device_combo_box->itemText(ui->audio_device_combo_box->currentIndex())
.toStdString();
Settings::values.volume =
static_cast<float>(ui->volume_slider->sliderPosition()) / ui->volume_slider->maximum();
}
void ConfigureAudio::updateAudioDevices(int sink_index) {