feat: Implement DBus IPC API

Author: timschneeb

src/MainWindow.cpp

@@ -28,6 +28,7 @@
 #include "interface/TrayIcon.h"
 #include "utils/Common.h"
 #include "utils/dbus/ClientProxy.h"
+#include "utils/dbus/IpcHandler.h"
 #include "utils/dbus/ServerAdaptor.h"
 #include "utils/DebuggerUtils.h"
 #include "utils/Log.h"
@@ -94,6 +95,7 @@ MainWindow::MainWindow(bool     statupInTray,
         _styleHelper         = new StyleHelper(this);
         _eelEditor           = new EELEditor(this);
         _trayIcon            = new TrayIcon(this);
+        _ipcHandler          = new IpcHandler(_audioService, this);
 
         _appMgrFragment = new FragmentHost<AppManagerFragment*>(new AppManagerFragment(_audioService->appManager(), this), WAF::BottomSide, this);
         _statusFragment = new FragmentHost<StatusFragment*>(new StatusFragment(this), WAF::BottomSide, this);
@@ -424,9 +426,8 @@ MainWindow::MainWindow(bool     statupInTray,
 MainWindow::~MainWindow()
 {
     if(_audioService != nullptr)
-    {
         delete _audioService;
-    }
+    delete _ipcHandler;
     delete ui;
 }
 
@@ -779,15 +780,15 @@ void MainWindow::applyConfig()
     DspConfig::instance().set(DspConfig::master_postgain,            QVariant(ui->postgain->valueA()));
 
     DspConfig::instance().set(DspConfig::ddc_enable,                 QVariant(ui->ddc_enable->isChecked()));
-    DspConfig::instance().set(DspConfig::ddc_file,                   QVariant("\"" + _currentVdc + "\""));
+    DspConfig::instance().set(DspConfig::ddc_file,                   QVariant(_currentVdc));
 
     DspConfig::instance().set(DspConfig::liveprog_enable,            QVariant(ui->liveprog->isActive()));
-    DspConfig::instance().set(DspConfig::liveprog_file,              QVariant("\"" + ui->liveprog->currentLiveprog() + "\""));
+    DspConfig::instance().set(DspConfig::liveprog_file,              QVariant(ui->liveprog->currentLiveprog()));
 
     DspConfig::instance().set(DspConfig::convolver_enable,           QVariant(ui->conv_enable->isChecked()));
     DspConfig::instance().set(DspConfig::convolver_optimization_mode,QVariant(ui->conv_ir_opt->currentIndex()));
-    DspConfig::instance().set(DspConfig::convolver_file,             QVariant("\"" + _currentImpulseResponse + "\""));
-    DspConfig::instance().set(DspConfig::convolver_waveform_edit,    QVariant("\"" + _currentConvWaveformEdit + "\""));
+    DspConfig::instance().set(DspConfig::convolver_file,             QVariant(_currentImpulseResponse));
+    DspConfig::instance().set(DspConfig::convolver_waveform_edit,    QVariant(_currentConvWaveformEdit));
 
     DspConfig::instance().set(DspConfig::compression_enable,         QVariant(ui->enable_comp->isChecked()));
     DspConfig::instance().set(DspConfig::compression_maxatk,         QVariant(ui->comp_maxattack->valueA()));
@@ -816,13 +817,13 @@ void MainWindow::applyConfig()
             counter++;
         }
 
-        DspConfig::instance().set(DspConfig::tone_eq, QVariant("\"" + rawEqString + "\""));
+        DspConfig::instance().set(DspConfig::tone_eq, QVariant(rawEqString));
     }
     else
     {
         QString rawEqString;
         ui->eq_dyn_widget->storeCsv(rawEqString);
-        DspConfig::instance().set(DspConfig::tone_eq, QVariant("\"" + rawEqString + "\""));
+        DspConfig::instance().set(DspConfig::tone_eq, QVariant(rawEqString));
     }
 
     DspConfig::instance().set(DspConfig::bass_enable,               QVariant(ui->bassboost->isChecked()));
@@ -858,7 +859,7 @@ void MainWindow::applyConfig()
     DspConfig::instance().set(DspConfig::graphiceq_enable,          QVariant(ui->graphicEq->chk_enable->isChecked()));
     QString streq;
     ui->graphicEq->store(streq);
-    DspConfig::instance().set(DspConfig::graphiceq_param,           QVariant("\"" + streq + "\""));
+    DspConfig::instance().set(DspConfig::graphiceq_param,           QVariant(streq));
 
     DspConfig::instance().commit();
     DspConfig::instance().save();

src/MainWindow.h

@@ -45,6 +45,7 @@ class QVBoxLayout;
 class AudioManager;
 class SingleInstanceMonitor;
 class StatusFragment;
+class IpcHandler;
 
 using namespace std;
 namespace Ui
@@ -123,6 +124,7 @@ private slots:
     FragmentHost<PresetFragment*>* _presetFragment     = nullptr;
 
     IAudioService* _audioService       = nullptr;
+    IpcHandler* _ipcHandler            = nullptr;
 
     bool _blockApply                   = false;
 

src/config/DspConfig.h

@@ -133,10 +133,9 @@ class DspConfig :
     }
 
 	template<class T>
-    T get(const Key &key, bool* exists = nullptr)
-	{
-        auto skey = QVariant::fromValue(key).toString();
-        auto variant = _conf->getVariant(skey, true, exists);
+    T get(const QString &key, bool* exists = nullptr)
+    {
+        auto variant = _conf->getVariant(key, true, exists);
 
         if constexpr (std::is_same_v<T, QVariant>) {
             return (T)(variant);
@@ -161,6 +160,12 @@ class DspConfig :
         throw new std::exception;
 	}
 
+    template<class T>
+    T get(const Key &key, bool* exists = nullptr)
+    {
+        return get<T>(QVariant::fromValue(key).toString(), exists);
+    }
+
     Type type(const Key &key)
     {
         bool exists;

src/data/model/PresetListModel.cpp

@@ -57,3 +57,8 @@ void PresetListModel::rescan()
 
     endResetModel();
 }
+
+QStringList PresetListModel::getList() const
+{
+    return presets;
+}

src/data/model/PresetListModel.h

@@ -14,6 +14,7 @@ class PresetListModel : public QAbstractListModel
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     void rescan();
+    QStringList getList() const;
 
 private:
 

src/main.cpp

@@ -81,20 +81,21 @@ int main(int   argc,
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QApplication app(argc, argv);
 
+    QCommandLineOption tray(QStringList() << "t" << "tray", "Start minimized in systray (forced)");
+    QCommandLineOption watch(QStringList() << "w" << "watch", "Watch audio.conf and apply changes made by external apps automatically");
+    QCommandLineOption minst(QStringList() << "m" << "allow-multiple-instances", "Allow multiple instances of this app");
+    QCommandLineOption spinlck(QStringList() << "d" << "spinlock-on-crash", "Wait for debugger in case of crash");
+    QCommandLineOption silent(QStringList() << "s" << "silent", "Suppress log output");
+    QCommandLineOption nocolor(QStringList() << "c" << "no-color", "Disable colored log output");
+
 	QCommandLineParser parser;
 	parser.setApplicationDescription("JamesDSP for Linux");
 	parser.addHelpOption();
-    QCommandLineOption tray(QStringList() << "t" << "tray", "Start minimized in systray (forced)");
     parser.addOption(tray);
-    QCommandLineOption watch(QStringList() << "w" << "watch", "Watch audio.conf and apply changes made by external apps automatically");
     parser.addOption(watch);
-    QCommandLineOption minst(QStringList() << "m" << "allow-multiple-instances", "Allow multiple instances of this app");
     parser.addOption(minst);
-    QCommandLineOption spinlck(QStringList() << "d" << "spinlock-on-crash", "Wait for debugger in case of crash");
     parser.addOption(spinlck);
-    QCommandLineOption silent(QStringList() << "s" << "silent", "Suppress log output");
     parser.addOption(silent);
-    QCommandLineOption nocolor(QStringList() << "c" << "no-color", "Disable colored log output");
     parser.addOption(nocolor);
     parser.process(app);
 
@@ -139,7 +140,10 @@ int main(int   argc,
 
     // Check if another instance is already running and switch to it if that's the case
     auto *instanceMonitor = new SingleInstanceMonitor();
-    auto scopeGuard = qScopeGuard([instanceMonitor]{ delete instanceMonitor; });
+    auto scopeGuard = qScopeGuard([instanceMonitor]{
+        delete instanceMonitor;
+    });
+
     if (!instanceMonitor->isServiceReady() && !parser.isSet(minst))
     {
         instanceMonitor->handover();

src/src.pro

@@ -86,6 +86,7 @@ SOURCES += \
     utils/Log.cpp \
     utils/SingleInstanceMonitor.cpp \
     utils/dbus/ClientProxy.cpp \
+    utils/dbus/IpcHandler.cpp \
     utils/dbus/ServerAdaptor.cpp \
     utils/OverlayMsgProxy.cpp \
     utils/StyleHelper.cpp
@@ -160,6 +161,7 @@ HEADERS += \
     utils/SingleInstanceMonitor.h \
     utils/VersionMacros.h \
     utils/dbus/ClientProxy.h \
+    utils/dbus/IpcHandler.h \
     utils/dbus/ServerAdaptor.h \
     utils/FindBinary.h \
     utils/OverlayMsgProxy.h \

src/subprojects/LiquidEqualizerWidget

@@ -9,8 +9,8 @@ SingleInstanceMonitor::SingleInstanceMonitor(QObject* parent) : QObject(parent)
     QDBusConnection connection = QDBusConnection::sessionBus();
 
     _dbusAdapter = new GuiAdaptor(this);
-    _registered  = connection.registerObject("/Gui", this) &&
-            connection.registerService("me.timschneeberger.jdsp4linux.Gui");
+    _registered  = connection.registerObject("/jdsp4linux/gui", this) &&
+            connection.registerService("me.timschneeberger.jdsp4linux");
 
 }
 
@@ -36,7 +36,7 @@ bool SingleInstanceMonitor::isServiceReady()
 bool SingleInstanceMonitor::handover()
 {
     Log::information("Attempting to switch to this instance...");
-    auto m_dbInterface = new cf::thebone::jdsp4linux::Gui("me.timschneeberger.jdsp4linux.Gui", "/Gui",
+    auto m_dbInterface = new me::timschneeberger::jdsp4linux::Gui("me.timschneeberger.jdsp4linux", "/jdsp4linux/gui",
                                                           QDBusConnection::sessionBus(), this);
     if (!m_dbInterface->isValid())
     {

src/utils/SingleInstanceMonitor.cpp

@@ -6,8 +6,10 @@
 
 #ifdef USE_PULSEAUDIO
 #define APP_FLAVOR "(Pulseaudio flavor)"
+#define APP_FLAVOR_SHORT "Pulseaudio"
 #else
 #define APP_FLAVOR "(Pipewire flavor)"
+#define APP_FLAVOR_SHORT "Pipewire"
 #endif
 
 #define APP_VERSION_FULL STR(APP_VERSION) " " APP_FLAVOR