Update project structure

Author: timschneeb

JDSP4Linux.pro

@@ -2,8 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     libjamesdsp \
-    src/subprojects/EELEditor \
     src
 
 src.depends = libjamesdsp
-src.depends = src/subprojects/EELEditor

src/MainWindow.cpp

@@ -151,9 +151,9 @@ MainWindow::MainWindow(bool     statupInTray,
         connect(_audioService, &IAudioService::convolverInfoChanged, this, &MainWindow::onConvolverInfoChanged);
 
         // TODO
-        //        QTimer *timer = new QTimer(this);
-        //        connect(timer, SIGNAL(timeout()), _audioService, SLOT(enumerateLiveprogVariables()));
-        //        timer->start(200);
+       QTimer *timer = new QTimer(this);
+       connect(timer, SIGNAL(timeout()), _audioService, SLOT(enumerateLiveprogVariables()));
+       timer->start(200);
 
         connect(_eelEditor, &EELEditor::executionRequested, [this](QString path){
             if (QFileInfo::exists(path) && QFileInfo(path).isFile())

src/audio/base/IAudioService.h

@@ -21,15 +21,17 @@ class IAudioService : public QObject
 
 public slots:
     virtual void update(DspConfig* config) = 0;
-    virtual void reloadLiveprog() = 0;
+
     virtual void reloadService() = 0;
 
     virtual IAppManager* appManager() = 0;
+    virtual DspHost* host() = 0;
 
     virtual std::vector<IOutputDevice> sinkDevices() = 0;
     virtual DspStatus status() = 0;
 
-    virtual void enumerateLiveprogVariables() = 0;
+    void reloadLiveprog();
+    void enumerateLiveprogVariables();
 
     void handleMessage(DspHost::Message msg, std::any arg);
 
@@ -43,6 +45,29 @@ public slots:
 
 };
 
+inline void IAudioService::reloadLiveprog()
+{
+    host()->reloadLiveprog();
+}
+
+#include <iostream>
+inline void IAudioService::enumerateLiveprogVariables()
+{
+    auto vars = this->host()->enumEelVariables();
+
+    for(const auto& var : vars)
+    {
+        if(std::holds_alternative<std::string>(var.value))
+            std::cout << std::boolalpha << var.name << "\t\t" << std::get<std::string>(var.value) << "\t" << var.isString << std::endl;
+        else
+            std::cout << std::boolalpha << var.name << "\t\t" << std::get<float>(var.value) << "\t" << var.isString << std::endl;
+    }
+
+    std::cout << "-------------------" << std::endl;
+
+    emit eelVariablesEnumerated(vars);
+}
+
 inline void IAudioService::handleMessage(DspHost::Message msg, std::any value)
 {
     switch(msg)

src/audio/pipewire/PipewireAudioService.cpp

@@ -127,18 +127,18 @@ void PipewireAudioService::update(DspConfig *config)
     plugin->host()->update(config);
 }
 
-void PipewireAudioService::reloadLiveprog()
-{
-    plugin->host()->reloadLiveprog();
-}
-
 void PipewireAudioService::reloadService()
 {
     effects.get()->disconnect_filters();
     plugin->host()->updateFromCache();
     effects.get()->connect_filters();
 }
 
+DspHost *PipewireAudioService::host()
+{
+    return plugin->host();
+}
+
 IAppManager *PipewireAudioService::appManager()
 {
     return appMgr.get();
@@ -168,25 +168,3 @@ DspStatus PipewireAudioService::status()
     return plugin->status();
 }
 
-#include <iostream>
-
-#include <config/AppConfig.h>
-void PipewireAudioService::enumerateLiveprogVariables()
-{
-
-    // TODO
-    auto vars = plugin->host()->enumEelVariables();
-
-    for(const auto& var : vars)
-    {
-        if(std::holds_alternative<std::string>(var.value))
-            std::cout << std::boolalpha << var.name << "\t\t" << std::get<std::string>(var.value) << "\t" << var.isString << std::endl;
-        else
-            std::cout << std::boolalpha << var.name << "\t\t" << std::get<float>(var.value) << "\t" << var.isString << std::endl;
-    }
-
-    std::cout << "-------------------" << std::endl;
-
-    emit eelVariablesEnumerated(vars);
-}
-

src/audio/pipewire/PipewireAudioService.h

@@ -26,15 +26,13 @@ public slots:
     void onAppConfigUpdated(const AppConfig::Key& key, const QVariant& value);
 
     void update(DspConfig* config) override;
-    void reloadLiveprog() override;
     void reloadService() override;
 
+    DspHost* host() override;
     IAppManager* appManager() override;
     std::vector<IOutputDevice> sinkDevices() override;
     DspStatus status() override;
 
-    void enumerateLiveprogVariables() override;
-
 private:
     const std::string log_tag = "PipewireAudioService: ";
 

src/audio/pulseaudio/PulseAudioService.cpp

@@ -114,17 +114,17 @@ void PulseAudioService::update(DspConfig *config)
     mgr.get()->getDsp()->host()->update(config);
 }
 
-void PulseAudioService::reloadLiveprog()
-{
-    mgr.get()->getDsp()->host()->reloadLiveprog();
-}
-
 void PulseAudioService::reloadService()
 {
     mgr.get()->relink();
     mgr.get()->getDsp()->host()->updateFromCache();
 }
 
+DspHost *PulseAudioService::host()
+{
+    return mgr.get()->getDsp()->host();
+}
+
 IAppManager *PulseAudioService::appManager()
 {
     return appMgr;
@@ -145,9 +145,3 @@ DspStatus PulseAudioService::status()
     return mgr.get()->getDsp()->status();
 }
 
-void PulseAudioService::enumerateLiveprogVariables()
-{
-    auto vars = mgr.get()->getDsp()->host()->enumEelVariables();
-    emit eelVariablesEnumerated(vars);
-}
-

src/audio/pulseaudio/PulseAudioService.h

@@ -22,15 +22,13 @@ class PulseAudioService : public IAudioService
 
 public slots:
     void update(DspConfig* config) override;
-    void reloadLiveprog() override;
     void reloadService() override;
 
+    DspHost* host() override;
     IAppManager* appManager() override;
     std::vector<IOutputDevice> sinkDevices() override;
     DspStatus status() override;
 
-    void enumerateLiveprogVariables() override;
-
 private:
     PulsePipelineManagerPtr mgr;
     PulseAppManager* appMgr;

src/src.pro

@@ -25,6 +25,9 @@ include(subprojects/FlatTabWidget/FlatTabWidget/FlatTabWidget.pri)
 include(subprojects/LiquidEqualizerWidget/LiquidEqualizerWidget.pri)
 include(subprojects/GraphicEQWidget/GraphicEQWidget/GraphicEQWidget.pri)
 
+DEFINES += HAS_JDSP_DRIVER
+include(subprojects/EELEditor/src/EELEditor.pri)
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -193,16 +196,3 @@ INCLUDEPATH += $$PWD/../libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/
                $$PWD/../libjamesdsp
 DEPENDPATH += $$PWD/../libjamesdsp
 unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../libjamesdsp/liblibjamesdsp.a
-
-# Link libEELEditor
-unix:!macx: LIBS += -L$$OUT_PWD/subprojects/EELEditor/src -leeleditor
-INCLUDEPATH += $$PWD/subprojects/EELEditor/src \
-               $$PWD/subprojects/EELEditor/3rdparty/QCodeEditor/include
-DEPENDPATH += $$PWD/subprojects/EELEditor/src
-unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/subprojects/EELEditor/src/libeeleditor.a
-
-# Link libqtadvanceddocking (libEELEditor)
-LIBS += -L$$OUT_PWD/subprojects/EELEditor/3rdparty/docking-system/lib
-include($$PWD/subprojects/EELEditor/3rdparty/docking-system/ads.pri)
-INCLUDEPATH += $$PWD/subprojects/EELEditor/3rdparty/docking-system/src
-DEPENDPATH += $$PWD/subprojects/EELEditor/3rdparty/docking-system/src