refactor: begin applying upstream updates

This does compile, but the FIR EQ is still in-place but
commented-out.

Author: timschneeb

libjamesdsp/PrintfStdOutExtension.c

@@ -5,22 +5,34 @@ 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;
+    // 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);
-   }
+    if(_printfStdOutHandlerPtr != 0)
+    {
+        _printfStdOutHandlerPtr(outstr, _printfStdOutHandlerUserPtr);
+    }
 
-   free(outstr);
-   return result;
+    free(outstr);
+    return result;
+}
+
+void __android_log_print(int severity, const char* tag, const char* msg) {
+    char *s;
+    if (asprintf(&s, "%s: %s", tag, msg) > 0 && s != 0)
+    {
+        if(_printfStdOutHandlerPtr != 0)
+        {
+            _printfStdOutHandlerPtr(s, _printfStdOutHandlerUserPtr);
+        }
+        free(s);
+    }
 }
 
 void setPrintfStdOutHandler(stdOutHandler funcPtr, void* userData)

libjamesdsp/libjamesdsp.pro

@@ -12,7 +12,8 @@ CONFIG += warn_off # Disable warnings for library
 
 DEFINES += CUSTOM_CMD
 DEFINES += DEBUG # TODO remove?
-DEFINES += printf=redirected_printf
+
+DEFINES += printf=redirected_printf ANDROID_LOG_INFO=0
 
 BASEPATH = $$PWD/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/
 
@@ -87,7 +88,6 @@ SOURCES += \
     $$BASEPATH/Effects/eel2/numericSys/solvopt.c \
     $$BASEPATH/Effects/eel2/s_str.c \
     $$BASEPATH/Effects/eel2/y.tab.c \
-    $$BASEPATH/Effects/firEqualizer.c \
     $$BASEPATH/Effects/liveprogWrapper.c \
     $$BASEPATH/Effects/reverb.c \
     $$BASEPATH/Effects/stereoEnhancement.c \
@@ -103,7 +103,8 @@ SOURCES += \
     $$BASEPATH/jdspController.c \
     EELStdOutExtension.c \
     PrintfStdOutExtension.c \
-    JdspImpResToolbox.c
+    JdspImpResToolbox.c \
+    subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/multimodalEQ.c
 
 unix {
     isEmpty(LIBDIR) {

src/audio/base/DspHost.cpp

@@ -144,7 +144,7 @@ void DspHost::updateFirEqualizer(DspConfig *config)
         param[i] = (double)std::stod(v[i]);
     }
 
-    FIREqualizerAxisInterpolation(cast(this->_dsp), interpolationMode, filterType, param, param + 15);
+    // TODO FIREqualizerAxisInterpolation(cast(this->_dsp), interpolationMode, filterType, param, param + 15);
 }
 
 void DspHost::updateVdc(DspConfig *config)
@@ -181,7 +181,7 @@ void DspHost::updateVdc(DspConfig *config)
         QTextStream in(&f);
         DDCStringParser(cast(this->_dsp), in.readAll().toLocal8Bit().data());
 
-        int ret = DDCEnable(cast(this->_dsp));
+        int ret = DDCEnable(cast(this->_dsp), 1);
         if (ret <= 0)
         {
             util::error("Call to DDCEnable(this->_dsp) failed. Invalid DDC parameter?");
@@ -358,7 +358,7 @@ void DspHost::updateConvolver(DspConfig *config)
         util::debug("Impulse response loaded: channels=" + std::to_string(impInfo[0]) + ", frames=" + std::to_string(impInfo[1]));
 
         Convolver1DDisable(cast(this->_dsp));
-        success = Convolver1DLoadImpulseResponse(cast(this->_dsp), impulse, impInfo[0], impInfo[1]);
+        success = Convolver1DLoadImpulseResponse(cast(this->_dsp), impulse, impInfo[0], impInfo[1], 1);
     }
 
     delete[] impInfo;
@@ -398,7 +398,7 @@ void DspHost::updateGraphicEq(DspConfig *config)
     if(enabled)
     {
         ArbitraryResponseEqualizerStringParser(cast(this->_dsp), eq.toLocal8Bit().data());
-        ArbitraryResponseEqualizerEnable(cast(this->_dsp));
+        ArbitraryResponseEqualizerEnable(cast(this->_dsp), 1);
     }
     else
         ArbitraryResponseEqualizerDisable(cast(this->_dsp));
@@ -450,7 +450,7 @@ void DspHost::updateCrossfeed(DspConfig* config)
     }
 
     if(enabled)
-        CrossfeedEnable(cast(this->_dsp));
+        CrossfeedEnable(cast(this->_dsp), 1);
     else
         CrossfeedDisable(cast(this->_dsp));
 }
@@ -510,7 +510,7 @@ bool DspHost::update(DspConfig *config, bool ignoreCache)
             break;
         case DspConfig::compression_enable:
             if(current.toBool())
-                CompressorEnable(cast(this->_dsp));
+                CompressorEnable(cast(this->_dsp), 1);
             else
                 CompressorDisable(cast(this->_dsp));
             break;
@@ -593,10 +593,10 @@ bool DspHost::update(DspConfig *config, bool ignoreCache)
             }
             break;
         case DspConfig::tone_enable:
-            if(current.toBool())
+            /*if(current.toBool())
                 FIREqualizerEnable(cast(this->_dsp));
             else
-                FIREqualizerDisable(cast(this->_dsp));
+                FIREqualizerDisable(cast(this->_dsp));*/ //TODO
             break;
         case DspConfig::tone_eq:
         case DspConfig::tone_filtertype:

src/audio/base/IDspElement.h

@@ -24,16 +24,23 @@ class IDspElement
     void setMessageHandler(DspHost::MessageHandlerFunc&& extraHandler)
     {
         _msgHandler = std::move(extraHandler);
+        _msgHandlerReady = true;
     }
 
     void callMessageHandler(DspHost::Message msg, std::any param)
     {
-        _msgHandler(msg, param);
+        if(_msgHandlerReady)
+            _msgHandler(msg, param);
+        else {
+            // TODO fix this case
+            // printf("IDspElement::callMessageHandler: dropped message of type '%d'\n", msg);
+        }
     }
 
 protected:
     DspHost* _host = nullptr;
     DspHost::MessageHandlerFunc _msgHandler;
+    bool _msgHandlerReady = false;
 
 };