Don't spam qmpmidioutfluid everywhere.

Also stop using stuff removed from Qt 6 (not yet done).

6 files changed, 13 insertions, 5 deletions

diff --git a/qmidiplayer-desktop/qmpefxwindow.cpp b/qmidiplayer-desktop/qmpefxwindow.cpp
index 154b053..0a281cd 100644
--- a/qmidiplayer-desktop/qmpefxwindow.cpp
+++ b/qmidiplayer-desktop/qmpefxwindow.cpp
@@ -2,6 +2,7 @@
 #include "qmpefxwindow.hpp"
 #include "ui_qmpefxwindow.h"
 #include "qmpmainwindow.hpp"
+#include "qmpmidioutfluid.hpp"
 
 qmpEfxWindow::qmpEfxWindow(QWidget *parent) :
     QWidget(parent, Qt::Dialog),
diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp
index ac1d939..69a0ba9 100644
--- a/qmidiplayer-desktop/qmpmainwindow.cpp
+++ b/qmidiplayer-desktop/qmpmainwindow.cpp
@@ -7,9 +7,10 @@
 #include <QFont>
 #include <QTextCodec>
 #include <QDirIterator>
-#include <QDesktopWidget>
 #include <QMessageBox>
 #include <QCheckBox>
+#include "qmpmidioutfluid.hpp"
+#include "qmpmidiplay.hpp"
 #include "qmpmainwindow.hpp"
 #include "ui_qmpmainwindow.h"
 #define setButtonHeight(x,h) {x->setMaximumHeight(h*(logicalDpiY()/96.));x->setMinimumHeight(h*(logicalDpiY()/96.));}
@@ -778,7 +779,7 @@ bool qmpMainWindow::isDarkTheme()
 {
     if (!settings->getOptionEnumInt("Behavior/IconTheme"))
     {
-        return ui->centralWidget->palette().color(QPalette::Background).lightness() < 128;
+        return ui->centralWidget->palette().color(QPalette::Window).lightness() < 128;
     }
     else return 2 - settings->getOptionEnumInt("Behavior/IconTheme");
 }
diff --git a/qmidiplayer-desktop/qmpmainwindow.hpp b/qmidiplayer-desktop/qmpmainwindow.hpp
index 28fb82c..47a29f6 100644
--- a/qmidiplayer-desktop/qmpmainwindow.hpp
+++ b/qmidiplayer-desktop/qmpmainwindow.hpp
@@ -20,8 +20,6 @@
 #include <future>
 #include <map>
 #include <unordered_map>
-#include "qmpmidioutfluid.hpp"
-#include "qmpmidiplay.hpp"
 #include "qmpplugin.hpp"
 #include "qmpplistwindow.hpp"
 #include "qmpchannelswindow.hpp"
@@ -188,6 +186,11 @@ public:
     }
 };
 
+class IFluidSettings;
+class qmpMidiOutFluid;
+class qmpFileRendererFluid;
+class CMidiPlayer;
+
 class qmpMainWindow: public QMainWindow
 {
     Q_OBJECT
diff --git a/qmidiplayer-desktop/qmpplistwindow.cpp b/qmidiplayer-desktop/qmpplistwindow.cpp
index 3a1062e..aa708ae 100644
--- a/qmidiplayer-desktop/qmpplistwindow.cpp
+++ b/qmidiplayer-desktop/qmpplistwindow.cpp
@@ -192,7 +192,8 @@ void qmpPlistWindow::on_pbAddFolder_clicked()
     while (di.hasNext())
     {
         QString c = di.next();
-        if ((c.endsWith(".mid") || c.endsWith(".midi") || c.endsWith(".rmi")) && fluid_is_midifile(c.toStdString().c_str()))
+        //TODO: use file readers to do this check?
+        if ((c.endsWith(".mid") || c.endsWith(".midi") || c.endsWith(".rmi")))
             ui->lwFiles->addItem(new QListWidgetItem(c));
     }
 }
diff --git a/qmidiplayer-desktop/qmpplugin.cpp b/qmidiplayer-desktop/qmpplugin.cpp
index cdea00c..ca851ee 100644
--- a/qmidiplayer-desktop/qmpplugin.cpp
+++ b/qmidiplayer-desktop/qmpplugin.cpp
@@ -8,6 +8,7 @@
 #include <QDirIterator>
 #include "qmpplugin.hpp"
 #include "qmpmainwindow.hpp"
+#include "qmpmidioutfluid.hpp"
 #include "qmpsettingswindow.hpp"
 qmpPluginAPIImpl *qmpPluginManager::pluginAPI = nullptr;
 qmpMainWindow *qmpPluginManager::mainwindow = nullptr;
diff --git a/qmidiplayer-desktop/qmppresetselect.cpp b/qmidiplayer-desktop/qmppresetselect.cpp
index 51bb7d4..8ad05a3 100644
--- a/qmidiplayer-desktop/qmppresetselect.cpp
+++ b/qmidiplayer-desktop/qmppresetselect.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include "qmppresetselect.hpp"
 #include "ui_qmppresetselect.h"
+#include "qmpmidioutfluid.hpp"
 #include "qmpmainwindow.hpp"
 
 qmpPresetSelector::qmpPresetSelector(QWidget *parent) :