Catch Notes setting to allow not catching existing notes. (#221)

* Add on/off setting for Catch Notes to allow not catching late notes. * Formatting --------- Co-authored-by: weavermedia <dan@Dweaver.media>
SynthstromAudible · Jul 21, 2023 · 6b17091 · 6b17091
1 parent 1952142
commit 6b17091
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/src/deluge/gui/menu_item/runtime_feature/settings.cpp b/src/deluge/gui/menu_item/runtime_feature/settings.cpp
@@ -37,13 +37,15 @@ Setting menuMasterCompressorFx(RuntimeFeatureSettingType::MasterCompressorFx);
 Setting menuFineTempo(RuntimeFeatureSettingType::FineTempoKnob);
 Setting menuQuantize(RuntimeFeatureSettingType::Quantize);
 Setting menuPatchCableResolution(RuntimeFeatureSettingType::PatchCableResolution);
+Setting menuCatchNotes(RuntimeFeatureSettingType::CatchNotes);
 
 std::array<MenuItem*, RuntimeFeatureSettingType::MaxElement + 1> subMenuEntries{
     &menuDrumRandomizer,
     &menuMasterCompressorFx,
     &menuFineTempo,
     &menuQuantize,
     &menuPatchCableResolution,
+    &menuCatchNotes,
 
     nullptr,
 };

diff --git a/src/deluge/model/note/note_row.cpp b/src/deluge/model/note/note_row.cpp
@@ -47,6 +47,7 @@
 #include "io/midi/midi_device.h"
 #include "gui/views/view.h"
 #include "gui/views/instrument_clip_view.h"
+#include "model/settings/runtime_feature_settings.h"
 
 extern "C" {
 #include "RZA1/uart/sio_char.h"
@@ -238,15 +239,17 @@ uint8_t NoteRow::getSquareType(int32_t squareStart, int32_t squareWidth, Note**
 		if (clipCurrentlyPlaying && !muted) {
 			((InstrumentClip*)modelStack->getTimelineCounter())->expectEvent();
 
-			// If the play-pos is inside this note, see if we'd like to attempt a late-start of it
-			int actualPlayPos = getLivePos(modelStack);
+			if ((runtimeFeatureSettings.get(RuntimeFeatureSettingType::CatchNotes) == RuntimeFeatureStateToggle::On)) {
+				// If the play-pos is inside this note, see if we'd like to attempt a late-start of it
+				int actualPlayPos = getLivePos(modelStack);
 
-			int howFarIntoNote = actualPlayPos - newNote->pos;
-			if (howFarIntoNote < 0) {
-				howFarIntoNote += effectiveLength;
-			}
-			if (howFarIntoNote < newNote->getLength()) {
-				attemptLateStartOfNextNoteToPlay(modelStack, newNote);
+				int howFarIntoNote = actualPlayPos - newNote->pos;
+				if (howFarIntoNote < 0) {
+					howFarIntoNote += effectiveLength;
+				}
+				if (howFarIntoNote < newNote->getLength()) {
+					attemptLateStartOfNextNoteToPlay(modelStack, newNote);
+				}
 			}
 		}
 
@@ -2687,20 +2690,22 @@ void NoteRow::resumePlayback(ModelStackWithNoteRow* modelStack, bool clipMayMake
 
 		int32_t effectiveActualCurrentPos = getLivePos(modelStack);
 
-		// See if our play-pos is inside of a note, which we might want to try playing...
-		int i = notes.search(effectiveActualCurrentPos, LESS);
-		bool wrapping = (i == -1);
-		if (wrapping) {
-			i = notes.getNumElements() - 1;
-		}
-		Note* note = notes.getElement(i);
-		int noteEnd = note->pos + note->length;
-		if (wrapping) {
-			noteEnd -= modelStack->getLoopLength();
-		}
+		if ((runtimeFeatureSettings.get(RuntimeFeatureSettingType::CatchNotes) == RuntimeFeatureStateToggle::On)) {
+			// See if our play-pos is inside of a note, which we might want to try playing...
+			int i = notes.search(effectiveActualCurrentPos, LESS);
+			bool wrapping = (i == -1);
+			if (wrapping) {
+				i = notes.getNumElements() - 1;
+			}
+			Note* note = notes.getElement(i);
+			int noteEnd = note->pos + note->length;
+			if (wrapping) {
+				noteEnd -= modelStack->getLoopLength();
+			}
 
-		if (noteEnd > effectiveActualCurrentPos) {
-			attemptLateStartOfNextNoteToPlay(modelStack, note);
+			if (noteEnd > effectiveActualCurrentPos) {
+				attemptLateStartOfNextNoteToPlay(modelStack, note);
+			}
 		}
 	}
 

diff --git a/src/deluge/model/settings/runtime_feature_settings.cpp b/src/deluge/model/settings/runtime_feature_settings.cpp
@@ -79,6 +79,9 @@ void RuntimeFeatureSettings::init() {
 	// PatchCableResolution
 	SetupOnOffSetting(settings[RuntimeFeatureSettingType::PatchCableResolution], "Mod. depth decimals",
 	                  "ModDepthDecimals", RuntimeFeatureStateToggle::On);
+	// CatchNotes
+	SetupOnOffSetting(settings[RuntimeFeatureSettingType::CatchNotes], "CatchNotes", "catchNotes",
+	                  RuntimeFeatureStateToggle::On);
 }
 
 void RuntimeFeatureSettings::readSettingsFromFile() {

diff --git a/src/deluge/model/settings/runtime_feature_settings.h b/src/deluge/model/settings/runtime_feature_settings.h
@@ -40,6 +40,7 @@ enum RuntimeFeatureSettingType : uint32_t {
 	Quantize,
 	FineTempoKnob,
 	PatchCableResolution,
+	CatchNotes,
 	MaxElement // Keep as boundary
 };