Fix #276840, part 2.b): Show progress indicator when moving soundfonts

similar to when adding one, rather than appearing to hang
musescore · Nov 14, 2020 · ae54ec8 · ae54ec8
1 parent 1990ecc
commit ae54ec8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/audio/midi/fluid/fluidgui.cpp b/audio/midi/fluid/fluidgui.cpp
@@ -163,10 +163,7 @@ void FluidGui::moveSoundfontInTheList(int currentIdx, int targetIdx)
             fluid()->removeSoundFont(sfName);
 
       sfonts.move(currentIdx, targetIdx);
-      fluid()->loadSoundFonts(sfonts);
-      sfonts = fluid()->soundFonts();
-      soundFonts->clear();
-      soundFonts->addItems(sfonts);
+      loadSoundFontsAsync(sfonts);
       soundFonts->setCurrentRow(targetIdx);
       emit sfChanged();
       }
@@ -217,6 +214,20 @@ void FluidGui::soundFontDownClicked()
       moveSoundfontInTheList(row, row + 1);
       }
 
+//---------------------------------------------------------
+//   loadSoundFontsAsync
+//---------------------------------------------------------
+
+void FluidGui::loadSoundFontsAsync(QStringList sfonts)
+      {
+      QFuture<bool> future = QtConcurrent::run(fluid(), &FluidS::Fluid::loadSoundFonts, sfonts);
+      _futureWatcher.setFuture(future);
+      _progressTimer->start(1000);
+      _progressDialog->exec();
+
+      synthesizerChanged();
+      }
+
 //---------------------------------------------------------
 //   soundFontDeleteClicked
 //---------------------------------------------------------
@@ -258,7 +269,7 @@ void FluidGui::soundFontAddClicked()
       QFileInfoList l = FluidS::Fluid::sfFiles();
 
       SfListDialog ld(this);
-      foreach (const QFileInfo& fi, l)
+      for (const QFileInfo& fi : l)
             ld.add(fi.fileName(), fi.absoluteFilePath());
       if (!ld.exec())
             return;
@@ -316,7 +327,6 @@ void FluidGui::loadSf()
                                  tr("SoundFont %1 already loaded").arg(sfPath));
             }
       else {
-
             _loadedSfName = sfName;
             _loadedSfPath = sfPath;
             QFuture<bool> future = QtConcurrent::run(fluid(), &FluidS::Fluid::addSoundFont, sfPath);

diff --git a/audio/midi/fluid/fluidgui.h b/audio/midi/fluid/fluidgui.h
@@ -61,6 +61,7 @@ class FluidGui : public Ms::SynthesizerGui, Ui::FluidGui {
       QTimer * _progressTimer;
       std::list<struct SfNamePath> _sfToLoad;
       void loadSf();
+      void loadSoundFontsAsync(QStringList sfonts);
       void moveSoundfontInTheList(int currentIdx, int targetIdx);
 
    private slots:

diff --git a/audio/midi/zerberus/zerberus.cpp b/audio/midi/zerberus/zerberus.cpp
@@ -294,7 +294,7 @@ void Zerberus::allNotesOff(int channel)
 
 bool Zerberus::loadSoundFonts(const QStringList& sl)
       {
-      foreach (const QString& s, sl) {
+      for (const QString& s : sl) {
             if (!loadInstrument(s))
                   return false;
             }

diff --git a/audio/midi/zerberus/zerberusgui.cpp b/audio/midi/zerberus/zerberusgui.cpp
@@ -285,7 +285,7 @@ void ZerberusGui::soundFontAddClicked()
       QFileInfoList l = Zerberus::sfzFiles();
 
       SfzListDialog ld(this);
-      foreach (const QFileInfo& fi, l)
+      for (const QFileInfo& fi : l)
             ld.add(fi.fileName(), fi.absoluteFilePath());
       if (!ld.exec())
             return;