dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fading options

Browse Source
This commit is contained in:
Jonas Kvinge
2019-06-17 02:23:51 +02:00
parent a6766f3c99
commit 60e86b9881
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/settings/backendsettingspage.cpp
View File

@@ -102,6 +102,8 @@ void BackendSettingsPage::Load() {
ui_->combobox_engine->setCurrentIndex(ui_->combobox_engine->findData(enginetype)); ui_->combobox_engine->setCurrentIndex(ui_->combobox_engine->findData(enginetype));
if (EngineInitialised()) Load_Engine(enginetype); if (EngineInitialised()) Load_Engine(enginetype);
ui_->checkbox_volume_control->setChecked(s_.value("volume_control", true).toBool());
ui_->spinbox_bufferduration->setValue(s_.value("bufferduration", 4000).toInt()); ui_->spinbox_bufferduration->setValue(s_.value("bufferduration", 4000).toInt());
ui_->slider_bufferminfill->setValue(s_.value("bufferminfill", 33).toInt()); ui_->slider_bufferminfill->setValue(s_.value("bufferminfill", 33).toInt());
@@ -144,8 +146,6 @@ void BackendSettingsPage::Load() {
ui_->widget_alsa_plugin->hide(); ui_->widget_alsa_plugin->hide();
#endif #endif
ui_->checkbox_volume_control->setChecked(s_.value("volume_control", true).toBool());
if (!EngineInitialised()) return; if (!EngineInitialised()) return;
if (engine()->state() == Engine::Empty) { if (engine()->state() == Engine::Empty) {
@@ -156,14 +156,8 @@ void BackendSettingsPage::Load() {
ui_->combobox_engine->setEnabled(false); ui_->combobox_engine->setEnabled(false);
} }
ConnectSignals();
configloaded_ = true; configloaded_ = true;
}
void BackendSettingsPage::ConnectSignals() {
connect(ui_->combobox_engine, SIGNAL(currentIndexChanged(int)), SLOT(EngineChanged(int))); connect(ui_->combobox_engine, SIGNAL(currentIndexChanged(int)), SLOT(EngineChanged(int)));
connect(ui_->combobox_output, SIGNAL(currentIndexChanged(int)), SLOT(OutputChanged(int))); connect(ui_->combobox_output, SIGNAL(currentIndexChanged(int)), SLOT(OutputChanged(int)));
connect(ui_->combobox_device, SIGNAL(currentIndexChanged(int)), SLOT(DeviceSelectionChanged(int))); connect(ui_->combobox_device, SIGNAL(currentIndexChanged(int)), SLOT(DeviceSelectionChanged(int)));
@@ -179,6 +173,8 @@ void BackendSettingsPage::ConnectSignals() {
connect(ui_->checkbox_fadeout_auto, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); connect(ui_->checkbox_fadeout_auto, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged()));
connect(ui_->checkbox_volume_control, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); connect(ui_->checkbox_volume_control, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged()));
FadingOptionsChanged();
} }
bool BackendSettingsPage::EngineInitialised() { bool BackendSettingsPage::EngineInitialised() {
@@ -270,6 +266,8 @@ void BackendSettingsPage::Load_Output(QString output, QVariant device) {
if (ui_->combobox_output->count() >= 1) Load_Device(output, device); if (ui_->combobox_output->count() >= 1) Load_Device(output, device);
FadingOptionsChanged();
} }
void BackendSettingsPage::Load_Device(QString output, QVariant device) { void BackendSettingsPage::Load_Device(QString output, QVariant device) {
@@ -608,17 +606,17 @@ void BackendSettingsPage::radiobutton_alsa_plughw_clicked(bool checked) {
void BackendSettingsPage::FadingOptionsChanged() { void BackendSettingsPage::FadingOptionsChanged() {
if (EngineInitialised()) { if (!configloaded_ || !EngineInitialised()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
if (engine()->type() == Engine::GStreamer && !(engine()->ALSADeviceSupport(output.name) && !ui_->lineedit_device->text().isEmpty()) && ui_->checkbox_volume_control->isChecked()) { EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
ui_->groupbox_fading->setDisabled(false); if (engine()->type() == Engine::GStreamer && !(engine()->ALSADeviceSupport(output.name) && !ui_->lineedit_device->text().isEmpty()) && ui_->checkbox_volume_control->isChecked()) {
} ui_->groupbox_fading->setDisabled(false);
else { }
ui_->groupbox_fading->setDisabled(true); else {
ui_->checkbox_fadeout_stop->setChecked(false); ui_->groupbox_fading->setDisabled(true);
ui_->checkbox_fadeout_cross->setChecked(false); ui_->checkbox_fadeout_stop->setChecked(false);
ui_->checkbox_fadeout_auto->setChecked(false); ui_->checkbox_fadeout_cross->setChecked(false);
} ui_->checkbox_fadeout_auto->setChecked(false);
} }
ui_->widget_fading_options->setEnabled(ui_->checkbox_fadeout_stop->isChecked() || ui_->checkbox_fadeout_cross->isChecked() || ui_->checkbox_fadeout_auto->isChecked()); ui_->widget_fading_options->setEnabled(ui_->checkbox_fadeout_stop->isChecked() || ui_->checkbox_fadeout_cross->isChecked() || ui_->checkbox_fadeout_auto->isChecked());

1
src/settings/backendsettingspage.h
View File

@@ -79,7 +79,6 @@ private:
Ui_BackendSettingsPage *ui_; Ui_BackendSettingsPage *ui_;
void ConnectSignals();
bool EngineInitialised(); bool EngineInitialised();
void EngineChanged(Engine::EngineType enginetype); void EngineChanged(Engine::EngineType enginetype);