feat: reroute printf logging in libjamesdsp to JDSP4Linux's log output

Author: timschneeb

libjamesdsp/PrintfStdOutExtension.c

@@ -0,0 +1,35 @@
+#include "PrintfStdOutExtension.h"
+#include <stdarg.h>
+
+static stdOutHandler _printfStdOutHandlerPtr = 0;
+static void* _printfStdOutHandlerUserPtr = 0;
+
+int redirected_printf(const char * format, ...) {
+   // Make formatted string.
+   char* outstr = 0;
+   va_list ap;
+   va_start(ap, format);
+   int result = vasprintf(&outstr, format, ap);
+   va_end(ap);
+   if(result < 0) // Error occurred and `outstr` undefined if result < 0.
+       return result;
+
+   if(_printfStdOutHandlerPtr != 0)
+   {
+       _printfStdOutHandlerPtr(outstr, _printfStdOutHandlerUserPtr);
+   }
+
+   free(outstr);
+   return result;
+}
+
+void setPrintfStdOutHandler(stdOutHandler funcPtr, void* userData)
+{
+    _printfStdOutHandlerPtr = funcPtr;
+    _printfStdOutHandlerUserPtr = userData;
+}
+
+int isPrintfStdOutHandlerSet()
+{
+    return _printfStdOutHandlerPtr != 0;
+}

libjamesdsp/PrintfStdOutExtension.h

@@ -0,0 +1,10 @@
+#ifndef EELSTDOUTEXTENSION_H
+#define EELSTDOUTEXTENSION_H
+
+typedef void (*stdOutHandler)(const char*, void*);
+
+
+extern void setPrintfStdOutHandler(stdOutHandler funcPtr, void* userData);
+extern int isPrintfStdOutHandlerSet();
+
+#endif // EELSTDOUTEXTENSION_H

libjamesdsp/libjamesdsp.pro

@@ -11,6 +11,8 @@ QMAKE_CFLAGS += -std=gnu11 -O2
 CONFIG += warn_off # Disable warnings for library
 
 DEFINES += CUSTOM_CMD
+DEFINES += DEBUG # TODO remove?
+DEFINES += printf=redirected_printf
 
 BASEPATH = $$PWD/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/
 
@@ -50,6 +52,7 @@ HEADERS += \
     $$BASEPATH/generalDSP/spectralInterpolatorFloat.h \
     $$BASEPATH/jdsp_header.h \
     EELStdOutExtension.h \
+    PrintfStdOutExtension.h \
     JdspImpResToolbox.h
 
 SOURCES += \
@@ -99,6 +102,7 @@ SOURCES += \
     $$BASEPATH/generalDSP/spectralInterpolatorFloat.c \
     $$BASEPATH/jdspController.c \
     EELStdOutExtension.c \
+    PrintfStdOutExtension.c \
     JdspImpResToolbox.c
 
 unix {

src/MainWindow.cpp

@@ -85,6 +85,7 @@ MainWindow::MainWindow(bool     statupInTray,
         Log::debug("Blocklist mode: " + QString((AppConfig::instance().get<bool>(AppConfig::AudioAppBlocklistInvert) ? "allow" : "block")));
         _audioService = new PipewireAudioService();
 #endif
+        connect(_audioService, &IAudioService::logOutputReceived, this, [](const QString& msg){ Log::kernel(msg); });
         connect(&DspConfig::instance(), &DspConfig::updated, _audioService, &IAudioService::update);
         connect(&DspConfig::instance(), &DspConfig::updatedExternally, _audioService, &IAudioService::update);
     }
@@ -146,6 +147,7 @@ MainWindow::MainWindow(bool     statupInTray,
         });
 
         connect(_audioService, &IAudioService::outputDeviceChanged, &PresetManager::instance(), &PresetManager::onOutputDeviceChanged);
+        connect(_audioService, &IAudioService::convolverInfoChanged, this, &MainWindow::onConvolverInfoChanged);
 
         // Convolver file info
         ConvolverInfoEventArgs ciArgs;

src/audio/base/DspHost.h

@@ -21,7 +21,8 @@ class DspHost
         EelCompilerStart,
         EelCompilerResult,
         EelWriteOutputBuffer,
-        ConvolverInfoChanged
+        ConvolverInfoChanged,
+        PrintfWriteOutputBuffer
     };
 
     typedef std::function<void(Message,std::any)> MessageHandlerFunc;

src/audio/base/IAudioService.h

@@ -41,6 +41,7 @@ public slots:
     void eelOutputReceived(const QString& output);
     void eelVariablesEnumerated(const std::vector<EelVariable>& vars);
     void convolverInfoChanged(const ConvolverInfoEventArgs& args);
+    void logOutputReceived(const QString& output);
     void outputDeviceChanged(const QString& deviceName, const QString& deviceId);
 
 };
@@ -76,6 +77,9 @@ inline void IAudioService::handleMessage(DspHost::Message msg, std::any value)
     case DspHost::ConvolverInfoChanged:
         emit convolverInfoChanged(std::any_cast<ConvolverInfoEventArgs>(value));
         break;
+    case DspHost::PrintfWriteOutputBuffer:
+        emit logOutputReceived(std::any_cast<QString>(value));
+        break;
     default:
         break;
     }

src/audio/base/IDspElement.h

@@ -26,6 +26,11 @@ class IDspElement
         _msgHandler = std::move(extraHandler);
     }
 
+    void callMessageHandler(DspHost::Message msg, std::any param)
+    {
+        _msgHandler(msg, param);
+    }
+
 protected:
     DspHost* _host = nullptr;
     DspHost::MessageHandlerFunc _msgHandler;

src/audio/pipewire/PwJamesDspPlugin.cpp

@@ -1,8 +1,22 @@
 #include "PwJamesDspPlugin.h"
+#include <QString>
+
+extern "C" {
+#include <PrintfStdOutExtension.h>
+}
+
+void receivePrintfStdout(const char* msg, void* userdata) {
+    auto* plugin = static_cast<PwJamesDspPlugin*>(userdata);
+    if(plugin != nullptr) {
+        plugin->callMessageHandler(DspHost::PrintfWriteOutputBuffer, QString(msg));
+    }
+}
 
 PwJamesDspPlugin::PwJamesDspPlugin(PwPipelineManager* pipe_manager)
     : PwPluginBase("@PwJamesDspPlugin: ", "JamesDsp", pipe_manager)
 {
+    setPrintfStdOutHandler(receivePrintfStdout, this);
+
     this->dsp = (JamesDSPLib*) malloc(sizeof(JamesDSPLib));
     memset(this->dsp, 0, sizeof(JamesDSPLib));
 
@@ -31,6 +45,7 @@ PwJamesDspPlugin::~PwJamesDspPlugin() {
   JamesDSPFree(this->dsp);
   JamesDSPGlobalMemoryDeallocation();
 
+  setPrintfStdOutHandler(nullptr, nullptr);
   util::debug(log_tag + name + " destroyed");
 }
 

src/audio/pulseaudio/pipeline/JamesDspElement.cpp

@@ -1,11 +1,24 @@
 #include "config/DspConfig.h"
 
 #include "JamesDspElement.h"
-
 #include "DspHost.h"
 
+extern "C" {
+#include <PrintfStdOutExtension.h>
+}
+
+void receivePrintfStdout(const char* msg, void* userdata) {
+    auto* plugin = static_cast<JamesDspElement*>(userdata);
+    if(plugin != nullptr) {
+        plugin->callMessageHandler(DspHost::PrintfWriteOutputBuffer, QString(msg));
+    }
+}
+
+
 JamesDspElement::JamesDspElement() : FilterElement("jamesdsp", "jamesdsp")
 {
+    setPrintfStdOutHandler(receivePrintfStdout, this);
+
     gboolean gEnabled;
     gpointer gDspPtr = NULL;
     this->getValues("dsp_ptr", &gDspPtr,
@@ -26,7 +39,12 @@ JamesDspElement::JamesDspElement() : FilterElement("jamesdsp", "jamesdsp")
                 _msgHandler(msg, value);
                 break;
         }
-    });
+});
+}
+
+JamesDspElement::~JamesDspElement()
+{
+    setPrintfStdOutHandler(nullptr, nullptr);
 }
 
 DspStatus JamesDspElement::status()

src/audio/pulseaudio/pipeline/JamesDspElement.h

@@ -9,6 +9,7 @@ class JamesDspElement : public FilterElement, public IDspElement
 {
 public:
     JamesDspElement();
+    ~JamesDspElement();
     DspStatus status() override;
 
 private: