sampler revert

Author: benkuper

Source/Node/nodes/sampler/SamplerNode.cpp

@@ -50,6 +50,11 @@ SamplerNode::SamplerNode(var params) :
     clearLastRecordedTrigger = controlsCC.addTrigger("Clear", "Clear Last recorded or played note");
     clearAllNotesTrigger = controlsCC.addTrigger("Clear All Notes", "Clear all recorded notes");
 
+    revertLastMode = controlsCC.addEnumParameter("Revert Last Mode", "The way to revert when revert last is triggered");
+    revertLastMode->addOption("Last Played", LAST_PLAYED)->addOption("Last Recorded", LAST_RECORDED);
+
+    revertLastRecordedTrigger = controlsCC.addTrigger("Revert", "Revert Last recorded or played note");
+
     startAutoKey = controlsCC.addIntParameter("Start Auto Key", "The pitch to start auto key computation from", 0, 0, 127);
     endAutoKey = controlsCC.addIntParameter("End Auto Key", "The pitch to end auto key computation from", 127, 0, 127);
 
@@ -173,6 +178,19 @@ void SamplerNode::clearNote(int note)
 
 }
 
+void SamplerNode::revertNote(int note)
+{
+    if (note == -1 || note >= samplerNotes.size()) return;
+    ScopedSuspender sp(processor);
+    auto* sn = samplerNotes[note];
+    if (sn->state->getValueDataAsEnum<NoteState>() != FILLED) return;
+
+    for (int i = 0; i < sn->buffer.getNumChannels(); i++)
+    {
+        sn->buffer.reverse(i, 0, sn->buffer.getNumSamples());
+    }
+}
+
 void SamplerNode::clearAllNotes()
 {
     stopRecording();
@@ -443,6 +461,17 @@ void SamplerNode::onControllableFeedbackUpdateInternal(ControllableContainer* cc
     {
         clearAllNotes();
     }
+    else if (c == revertLastRecordedTrigger)
+    {
+        if (revertLastMode->getValueDataAsEnum<ClearMode>() == LAST_RECORDED)
+        {
+            revertNote(lastRecordedNote);
+        }
+        else
+        {
+            revertNote(lastPlayedNote);
+        }
+    }
     else if (c == loadBankTrigger)
     {
         loadBankSamples();

Source/Node/nodes/sampler/SamplerNode.h

@@ -35,9 +35,9 @@ class SamplerNode :
     EnumParameter* hitMode;
     IntParameter* oneShotFadeTimeMS;
     BoolParameter* autoKeyLiveMode;
-    IntParameter* autoKeyFadeTimeMS;
-    BoolParameter* autoKeyLoopFade;
-    EnumParameter* autoKeyMode;
+    IntParameter* autoKeyFadeTimeMS;
+    BoolParameter* autoKeyLoopFade;
+    EnumParameter* autoKeyMode;
 
     // --- New RubberBand Parameters ---
     BoolParameter* rbPreserveFormants;
@@ -46,11 +46,13 @@ class SamplerNode :
     EnumParameter* rbWindowSize;
 
     ControllableContainer controlsCC;
-    BoolParameter* clearMode;
-    enum ClearMode { LAST_PLAYED, LAST_RECORDED };
-    EnumParameter* clearLastMode;
-    Trigger* clearLastRecordedTrigger;
-    Trigger* clearAllNotesTrigger;
+    BoolParameter* clearMode;
+    enum ClearMode { LAST_PLAYED, LAST_RECORDED };
+    EnumParameter* clearLastMode;
+    Trigger* clearLastRecordedTrigger;
+    Trigger* clearAllNotesTrigger;
+    EnumParameter* revertLastMode;
+    Trigger* revertLastRecordedTrigger;
     IntParameter* startAutoKey;
     IntParameter* endAutoKey;
     Trigger* computeAutoKeysTrigger;
@@ -132,9 +134,9 @@ class SamplerNode :
 
         //offline pitching
         double shifting = 0;
-        int fadeNumSamples = 0;
-        int autoKeyAlgorithm = 0;
-        bool loopFadeEnabled = false;
+        int fadeNumSamples = 0;
+        int autoKeyAlgorithm = 0;
+        bool loopFadeEnabled = false;
 
         // --- RubberBand Offline Params ---
         bool optFormants = false;
@@ -151,21 +153,22 @@ class SamplerNode :
         std::unique_ptr<RubberBand::RubberBandStretcher> pitcher;
 
         void setAutoKey(SamplerNote* remoteNote, double shift = 0);
-        void computeAutoKey(SamplerNote* remoteNote, double shift, int fadeSamples, int algorithm, bool formants, int transients, int pitchMode, int windowSize, bool shouldLoopFade);
+        void computeAutoKey(SamplerNote* remoteNote, double shift, int fadeSamples, int algorithm, bool formants, int transients, int pitchMode, int windowSize, bool shouldLoopFade);
 
-        void run();
-
-        void reset();
-
-        bool hasContent() const { return buffer.getNumSamples() > 0; }
-        bool isProxyNote() const { return autoKeyFromNote != nullptr; }
-    };
-
-    OwnedArray<SamplerNote> samplerNotes;
+        void run();
+
+        void reset();
+
+        bool hasContent() const { return buffer.getNumSamples() > 0; }
+        bool isProxyNote() const { return autoKeyFromNote != nullptr; }
+    };
 
-    void clearNote(int note);
-    void clearAllNotes();
-    void resetAllNotes();
+    OwnedArray<SamplerNote> samplerNotes;
+
+    void revertNote(int note);
+    void clearNote(int note);
+    void clearAllNotes();
+    void resetAllNotes();
 
     void computeAutoKeys();