input meter linked to LockFreeQueue.cpp

works™
djshaji · Mar 9, 2024 · c46d847 · c46d847
1 parent 95cf722
commit c46d847
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/cpp/Engine.cpp b/app/src/main/cpp/Engine.cpp
@@ -69,7 +69,12 @@ bool Engine::setEffectOn(bool isOn) {
 
                 if (mFullDuplexPass.inSamples != NULL)
                     free (static_cast<void *>(mFullDuplexPass.inSamples));
+
+                if (mFullDuplexPass.raw != NULL)
+                    free (static_cast<void *>(mFullDuplexPass.raw));
+
                 mFullDuplexPass.inSamples = static_cast<float *>(malloc(mFullDuplexPass.mBufferSize));
+                mFullDuplexPass.raw = static_cast<float *>(malloc(mFullDuplexPass.mBufferSize));
                 fileWriter->setChannels(mOutputChannelCount);
                 /*
                 if (mFullDuplexPass.recordingActive) {

diff --git a/app/src/main/cpp/FullDuplexPass.h b/app/src/main/cpp/FullDuplexPass.h
@@ -54,6 +54,7 @@ class FullDuplexPass : public FullDuplexStream {
     int outputPorts [MAX_PLUGINS] ;
     int outputPorts2 [MAX_PLUGINS] ;
     int activePlugins =  0 ;
+    float * raw = NULL; // this will never be greater than this(TM)
     bool recordingActive = false ;
     bool triggerRecord = false ;
     bool bypass = false ;
@@ -81,8 +82,7 @@ class FullDuplexPass : public FullDuplexStream {
 
 //        float inSamples [samplesToProcess];
         for (int i = 0 ; i < samplesToProcess ; i ++) {
-            outputFloats [i] = inputFloats [i];
-            inSamples [i] = inputFloats [i] * inputVolume ;
+            raw [i] = inSamples [i] = inputFloats [i] * inputVolume ;
         }
 
 //        if (meterEnabled) {
@@ -107,7 +107,7 @@ class FullDuplexPass : public FullDuplexStream {
 //            Meter::process (samplesToProcess, inSamples, false);
 //        }
 
-        lockFreeQueueManager->process(outputFloats, inSamples, samplesToProcess) ;
+        lockFreeQueueManager->process(raw, inSamples, samplesToProcess) ;
 
         //        for (int32_t i = 0; i < samplesToProcess; i++) {
 //            *outputFloats++ = *inputFloats++  * outputVolume; // do some arbitrary processing

diff --git a/app/src/main/cpp/LockFreeQueue.cpp b/app/src/main/cpp/LockFreeQueue.cpp
@@ -67,14 +67,13 @@ void LockFreeQueueManager::main () {
     IN
     AudioBuffer * buffer ;
     while (ready) {
-        if (lockFreeQueue.pop (buffer)) {
+        while (lockFreeQueue.pop (buffer)) {
             for (int i = 0; i < functions_count; i++) {
                 (functions[i])(buffer);
             }
         }
 
-//        std::this_thread::sleep_for(std::chrono::milliseconds (1));
-
+        std::this_thread::sleep_for(std::chrono::milliseconds (100));
     }
     OUT
 }

diff --git a/app/src/main/cpp/LockFreeQueue.h b/app/src/main/cpp/LockFreeQueue.h
@@ -159,7 +159,7 @@ class LockFreeQueue {
 };
 
 #define LOCK_FREE_SIZE 4096
-#define SPARE_BUFFERS 16
+#define SPARE_BUFFERS 128
 
 class LockFreeQueueManager {
     static LockFreeQueue<AudioBuffer *, LOCK_FREE_SIZE> lockFreeQueue ;