default to record once with priming

Author: schollz

clients/oooooooo/src/KeyboardHandler.cpp

@@ -48,11 +48,21 @@ void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
       break;
     case SDLK_p:
       if (!isRepeat) {
-        if (softcut_->WasPrimed(*selectedLoop) &&
-            softcut_->IsRecording(*selectedLoop)) {
-          softcut_->ToggleRecord(*selectedLoop);
+        if (keysHeld_[SDLK_LCTRL] || keysHeld_[SDLK_RCTRL]) {
+          // pause and set to 0
+          softcut_->TogglePlay(*selectedLoop, false);
+          float startTimeDest = softcut_->getLoopStart(*selectedLoop);
+          // cut to the start
+          softcut_->handleCommand(new Commands::CommandPacket(
+              Commands::Id::SET_CUT_POSITION, *selectedLoop, startTimeDest));
+
         } else {
-          softcut_->TogglePlay(*selectedLoop);
+          if (softcut_->WasPrimed(*selectedLoop) &&
+              softcut_->IsRecording(*selectedLoop)) {
+            softcut_->ToggleRecord(*selectedLoop);
+          } else {
+            softcut_->TogglePlay(*selectedLoop);
+          }
         }
       }
       break;
@@ -103,7 +113,7 @@ void KeyboardHandler::handleKeyDown(SDL_Keycode key, bool isRepeat,
           }
 
         } else if (keysHeld_[SDLK_LSHIFT] || keysHeld_[SDLK_RSHIFT]) {
-          softcut_->ToggleRecordOnce(*selectedLoop);
+          softcut_->TogglePrimeToRecordOnce(*selectedLoop);
         } else {
           softcut_->ToggleRecord(*selectedLoop);
         }

clients/oooooooo/src/SoftcutClient.cpp

@@ -124,8 +124,18 @@ void SoftcutClient::process(jack_nframes_t numFrames) {
       rms += input[v].buf[0][i] * input[v].buf[0][i];
     }
     rms = sqrt(rms / static_cast<float>(numFrames));
+    if (isPrimed[v]) {
+      std::cerr << "primed: " << v << " rms: " << amp2db(rms)
+                << " sensitivity: " << primeSensitivity[v] << std::endl;
+    }
     if (amp2db(rms) > primeSensitivity[v] && isPrimed[v]) {
-      ToggleRecord(v, true);
+      if (isPrimedToRecordOnce[v]) {
+        ToggleRecordOnce(v);
+        isPrimedToRecordOnce[v] = false;
+        isPrimed[v] = false;
+      } else {
+        ToggleRecord(v, true);
+      }
     }
     blockRMS[v] = rms;
   }

clients/oooooooo/src/SoftcutClient.h

@@ -79,7 +79,16 @@ class SoftcutClient : public JackClient<2, 2> {
     doneRecordingPrimed[i] = false;
     isPrimed[i] = !isPrimed[i];
   }
+  void TogglePrimeToRecordOnce(int i) {
+    wasPrimed[i] = false;
+    doneRecordingPrimed[i] = false;
+    isPrimed[i] = !isPrimed[i];
+    isPrimedToRecordOnce[i] = isPrimed[i];
+  }
   bool IsPrimed(int i) { return isPrimed[i]; }
+  bool IsPrimedToRecordOnce(int i) {
+    return isPrimed[i] && isPrimedToRecordOnce[i];
+  }
   bool WasPrimed(int i) { return wasPrimed[i]; }
   void SetWasPrimed(int i, bool was) { wasPrimed[i] = was; }
   bool IsDoneRecordingPrimed(int i) {
@@ -102,6 +111,7 @@ class SoftcutClient : public JackClient<2, 2> {
   void TogglePlay(int i) {
     cut.setPlayFlag(i, !IsPlaying(i));
     isPrimed[i] = false;
+    isPrimedToRecordOnce[i] = false;
     wasPrimed[i] = false;
     doneRecordingPrimed[i] = false;
   }
@@ -114,9 +124,11 @@ class SoftcutClient : public JackClient<2, 2> {
   }
   float getCPUUsage() { return static_cast<float>(jack_cpu_load(client)); }
   void SetPrimeSensitivity(int i, float sensitivity) {
-    if (i >= 0 && i < NumVoices) {
-      primeSensitivity[i] = sensitivity;
+    for (int j = 0; j < NumVoices; ++j) {
+      primeSensitivity[j] = sensitivity;
     }
+    std::cerr << "SetPrimeSensitivity: " << i << " to " << primeSensitivity[i]
+              << std::endl;
   }
 
  private:
@@ -143,6 +155,7 @@ class SoftcutClient : public JackClient<2, 2> {
   VUMeter vuMeters[NumVoices];
   sample_t blockRMS[NumVoices];
   bool isPrimed[NumVoices];
+  bool isPrimedToRecordOnce[NumVoices];
   bool wasPrimed[NumVoices];
   bool doneRecordingPrimed[NumVoices];
   float primeSensitivity[NumVoices];