Liveprog: allow live variable manipulation + engine freeze

Author: timschneeb

libjamesdsp/libjamesdsp.pro

@@ -5,7 +5,9 @@ DEFINES += LIBJAMESDSP_PLUGIN
 
 CONFIG += c++17
 
-QMAKE_CFLAGS += -std=gnu11 -O2
+# TODO: remove debug mode
+# QMAKE_CFLAGS += -std=gnu11 -O2
+QMAKE_CFLAGS += -std=gnu11 -g3 -Og -gdwarf-2 -finline-functions
 
 CONFIG += warn_off # Disable warnings for library
 

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/nseel-compiler.c

@@ -7711,4 +7711,4 @@ opcodeRec *nseel_translate(compileContext *ctx, const char *tmp, size_t tmplen)
 		return nseel_createCompiledValue(ctx, (float)rv);
 	}
 	return nseel_createCompiledValue(ctx, (float)atof(tmp));
-}
+}

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/liveprogWrapper.c

@@ -1,9 +1,11 @@
 void NSEEL_HOSTSTUB_EnterMutex() { }
 void NSEEL_HOSTSTUB_LeaveMutex() { }
 #include "../jdsp_header.h"
+
 void LiveProgConstructor(JamesDSPLib *jdsp)
 {
 	LiveProg *pg = &jdsp->eel;
+    pg->active = 1;
 	pg->compileSucessfully = 0;
 	pg->codehandleInit = 0;
 	pg->codehandleProcess = 0;
@@ -146,7 +148,7 @@ int LiveProgStringParser(JamesDSPLib *jdsp, char *eelCode)
 void LiveProgProcess(JamesDSPLib *jdsp, size_t n)
 {
 	LiveProg *eel = &jdsp->eel;
-	if (eel->compileSucessfully)
+    if (eel->compileSucessfully && eel->active)
 	{
 		for (size_t i = 0; i < n; i++)
 		{

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/jdsp_header.h

@@ -364,6 +364,7 @@ typedef struct
 	NSEEL_CODEHANDLE codehandleInit, codehandleProcess;
 	float *vmFs, *input1, *input2;
 	int compileSucessfully;
+    int active;
 } LiveProg;
 typedef struct
 {

src/audio/base/DspHost.cpp

@@ -725,22 +725,22 @@ std::vector<EelVariable> DspHost::enumEelVariables()
 {
     std::vector<EelVariable> vars;
 
-    compileContext *c = (compileContext*)cast(this->_dsp)->eel.vm;
-    for (int i = 0; i < c->varTable_numBlocks; i++)
+    compileContext *ctx = (compileContext*)cast(this->_dsp)->eel.vm;
+    for (int i = 0; i < ctx->varTable_numBlocks; i++)
     {
         for (int j = 0; j < NSEEL_VARS_PER_BLOCK; j++)
         {
             EelVariable var;
-            char *valid = (char*)GetStringForIndex(c->m_string_context, c->varTable_Values[i][j], 0);
+            char *valid = (char*)GetStringForIndex(ctx->m_string_context, ctx->varTable_Values[i][j], 0);
             var.isString = valid;
 
-            if (c->varTable_Names[i][j])
+            if (ctx->varTable_Names[i][j])
             {
-                var.name = c->varTable_Names[i][j];
+                var.name = ctx->varTable_Names[i][j];
                 if(var.isString)
                     var.value = valid;
                 else
-                    var.value = c->varTable_Values[i][j];
+                    var.value = ctx->varTable_Values[i][j];
 
                 vars.push_back(var);
             }
@@ -750,6 +750,40 @@ std::vector<EelVariable> DspHost::enumEelVariables()
     return vars;
 }
 
+bool DspHost::manipulateEelVariable(const char* name, float value)
+{
+    compileContext *ctx = (compileContext*)cast(this->_dsp)->eel.vm;
+    for (int i = 0; i < ctx->varTable_numBlocks; i++)
+    {
+        for (int j = 0; j < NSEEL_VARS_PER_BLOCK; j++)
+        {
+            if(!ctx->varTable_Names[i][j] || std::strcmp(ctx->varTable_Names[i][j], name) != 0)
+            {
+                continue;
+            }
+
+            char *validString = (char*)GetStringForIndex(ctx->m_string_context, ctx->varTable_Values[i][j], 0);
+            if(validString)
+            {
+                Log::error(QString("DspHost::manipulateEelVariable: variable '%1' is a string; currently only numerical variables can be manipulated").arg(name));
+                return false;
+            }
+
+            ctx->varTable_Values[i][j] = value;
+            return true;
+        }
+    }
+
+    Log::error(QString("DspHost::manipulateEelVariable: variable '%1' not found").arg(name));
+    return false;
+}
+
+void DspHost::freezeLiveprogExecution(bool freeze)
+{
+    cast(this->_dsp)->eel.active = !freeze;
+    Log::debug("DspHost::freezeLiveprogExecution: Liveprog execution has been " + (freeze ? QString("frozen") : "resumed"));
+}
+
 void DspHost::dispatch(Message msg, std::any value)
 {
     _extraFunc(msg, value);

src/audio/base/DspHost.h

@@ -31,6 +31,8 @@ class DspHost
     void updateFromCache();
     void reloadLiveprog(DspConfig* config = nullptr);
     std::vector<EelVariable> enumEelVariables();
+    bool manipulateEelVariable(const char *name, float value);
+    void freezeLiveprogExecution(bool freeze);
     void dispatch(Message msg, std::any value);
 
 private: