From 85206112afb0afa55918d69cc0979854772e8470 Mon Sep 17 00:00:00 2001 From: AdmSasha Date: Thu, 11 Jul 2019 16:09:04 +0900 Subject: [PATCH] split save Fluid/SoundFont2 --- src/GuiMidiSetupDialog.cpp | 15 ++++++++++++--- src/Settings.cpp | 10 +++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/GuiMidiSetupDialog.cpp b/src/GuiMidiSetupDialog.cpp index 0cb264b..3f106f8 100644 --- a/src/GuiMidiSetupDialog.cpp +++ b/src/GuiMidiSetupDialog.cpp @@ -281,8 +281,12 @@ void GuiMidiSetupDialog::on_fluidAddButton_clicked ( bool checked ) m_settings->addFluidSoundFontName(soundFontName); updateFluidInfoText(); - m_settings->setValue("Fluid/SoundFont2",m_settings->getFluidSoundFontNames()); -} + + m_settings->setValue("Fluid/SoundFont2_1",""); + m_settings->setValue("Fluid/SoundFont2_2",""); + for (int i=0;igetFluidSoundFontNames().size();i++){ + m_settings->setValue("Fluid/SoundFont2_"+QString::number(1+i),m_settings->getFluidSoundFontNames().at(i)); + }} void GuiMidiSetupDialog::on_fluidRemoveButton_clicked ( bool checked ){ if (soundFontList->currentRow()==-1) return; @@ -293,6 +297,11 @@ void GuiMidiSetupDialog::on_fluidRemoveButton_clicked ( bool checked ){ soundFontList->removeItemWidget(soundFontList->currentItem()); updateFluidInfoText(); - m_settings->setValue("Fluid/SoundFont2",m_settings->getFluidSoundFontNames()); + + m_settings->setValue("Fluid/SoundFont2_1",""); + m_settings->setValue("Fluid/SoundFont2_2",""); + for (int i=0;igetFluidSoundFontNames().size();i++){ + m_settings->setValue("Fluid/SoundFont2_"+QString::number(1+i),m_settings->getFluidSoundFontNames().at(i)); + } } diff --git a/src/Settings.cpp b/src/Settings.cpp index 46df884..a67a977 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -73,11 +73,11 @@ CSettings::CSettings(QtWindow *mainWindow) : QSettings(CSettings::IniFormat, CSe // load Fluid settings - QStringList soundFontNames = value("Fluid/SoundFont2","").toStringList(); - for (QString soundFontName:soundFontNames){ - if (soundFontName.isEmpty()) continue; - addFluidSoundFontName(soundFontName); - } + QString soundFontNames_1 = value("Fluid/SoundFont2_1","").toString(); + if (!soundFontNames_1.isEmpty()) addFluidSoundFontName(soundFontNames_1); + + QString soundFontNames_2 = value("Fluid/SoundFont2_2","").toString(); + if (!soundFontNames_2.isEmpty()) addFluidSoundFontName(soundFontNames_2); }