Unify Audio- and instrument clip horizontal shift

src/deluge/gui/views/audio_clip_view.cpp

@@ -36,7 +36,6 @@
 #include "playback/mode/arrangement.h"
 #include "gui/ui_timer_manager.h"
 #include "model/consequence/consequence_clip_length.h"
-#include "model/consequence/consequence_instrument_clip_horizontal_shift.h"
 #include "hid/led/pad_leds.h"
 #include "hid/led/indicator_leds.h"
 #include "hid/buttons.h"
@@ -45,8 +44,6 @@
 #include "model/model_stack.h"
 #include "extern.h"
 #include "model/clip/clip_minder.h"
-#include "memory/general_memory_allocator.h"
-#include <new>
 
 extern "C" {
 extern uint8_t currentlyAccessingCard;
@@ -576,63 +573,6 @@ int AudioClipView::verticalEncoderAction(int offset, bool inCardRoutine) {
 	return ACTION_RESULT_DEALT_WITH;
 }
 
-int AudioClipView::horizontalEncoderAction(int offset) {
-	if ((isNoUIModeActive() && Buttons::isButtonPressed(yEncButtonX, yEncButtonY))
-	    || (isUIModeActiveExclusively(UI_MODE_HOLDING_HORIZONTAL_ENCODER_BUTTON)
-	        && Buttons::isButtonPressed(clipViewButtonX, clipViewButtonY))) {
-		if (sdRoutineLock) return ACTION_RESULT_REMIND_ME_OUTSIDE_CARD_ROUTINE; // Just be safe - maybe not necessary
-		int squareSize = getPosFromSquare(1) - getPosFromSquare(0);
-		int shiftAmount = offset * squareSize;
-		AudioClip* clip = getClip();
-
-		char modelStackMemory[MODEL_STACK_MAX_SIZE];
-		ModelStackWithTimelineCounter* modelStack = currentSong->setupModelStackWithCurrentClip(modelStackMemory);
-
-		bool was_shifted = clip->shiftHorizontally(modelStack, shiftAmount);
-		if (!was_shifted) {
-			numericDriver.displayPopup(HAVE_OLED ? "Can't shift past start" : "CANT");
-			return ACTION_RESULT_DEALT_WITH;
-		}
-
-		uiNeedsRendering(this, 0xFFFFFFFF, 0);
-
-		// If possible, just modify a previous Action to add this new shift amount to it.
-		Action* action = actionLogger.firstAction[BEFORE];
-		if (action && action->type == ACTION_INSTRUMENT_CLIP_HORIZONTAL_SHIFT && action->openForAdditions
-		    && action->currentClip == clip) {
-
-			// If there's no Consequence in the Action, that's probably because we deleted it a previous time with the code just below.
-			// Or possibly because the Action was created but there wasn't enough RAM to create the Consequence. Anyway, just go add a consequence now.
-			if (!action->firstConsequence) goto addConsequenceToAction;
-
-			ConsequenceInstrumentClipHorizontalShift* consequence =
-			    (ConsequenceInstrumentClipHorizontalShift*)action->firstConsequence;
-			consequence->amount += shiftAmount;
-		}
-
-		// Or if no previous Action, go create a new one now.
-		else {
-
-			action = actionLogger.getNewAction(ACTION_INSTRUMENT_CLIP_HORIZONTAL_SHIFT, ACTION_ADDITION_NOT_ALLOWED);
-			if (action) {
-addConsequenceToAction:
-				void* consMemory = generalMemoryAllocator.alloc(sizeof(ConsequenceInstrumentClipHorizontalShift));
-
-				if (consMemory) {
-					ConsequenceInstrumentClipHorizontalShift* newConsequence =
-					    new (consMemory) ConsequenceInstrumentClipHorizontalShift(shiftAmount);
-					action->addConsequence(newConsequence);
-				}
-			}
-		}
-		return ACTION_RESULT_DEALT_WITH;
-	}
-
-	// Or, let parent deal with it
-	else {
-		return ClipView::horizontalEncoderAction(offset);
-	}
-}
 bool AudioClipView::setupScroll(uint32_t oldScroll) {
 
 	if (!getClip()->currentlyScrollableAndZoomable()) return false;

src/deluge/gui/views/audio_clip_view.h

@@ -48,7 +48,6 @@ class AudioClipView final : public ClipView, public ClipMinder {
 	void sampleNeedsReRendering(Sample* sample);
 	void selectEncoderAction(int8_t offset);
 	int verticalEncoderAction(int offset, bool inCardRoutine);
-	int horizontalEncoderAction(int offset);
 	int timerCallback();
 	uint32_t getMaxLength();
 	unsigned int getMaxZoom();

src/deluge/gui/views/instrument_clip_view.cpp

@@ -55,7 +55,6 @@
 #include "gui/ui/rename/rename_drum_ui.h"
 #include "model/song/song.h"
 #include "model/clip/clip.h"
-#include "model/consequence/consequence_instrument_clip_horizontal_shift.h"
 #include "model/consequence/consequence_note_array_change.h"
 #include "gui/menu_item/menu_item_colour.h"
 #include "hid/led/pad_leds.h"
@@ -3877,56 +3876,6 @@ int InstrumentClipView::horizontalEncoderAction(int offset) {
 		return ACTION_RESULT_DEALT_WITH;
 	}
 
-	// Or, maybe shift everything horizontally
-	else if ((isNoUIModeActive() && Buttons::isButtonPressed(yEncButtonX, yEncButtonY))
-	         || (isUIModeActiveExclusively(UI_MODE_HOLDING_HORIZONTAL_ENCODER_BUTTON)
-	             && Buttons::isButtonPressed(clipViewButtonX, clipViewButtonY))) {
-		if (sdRoutineLock) return ACTION_RESULT_REMIND_ME_OUTSIDE_CARD_ROUTINE; // Just be safe - maybe not necessary
-		int squareSize = getPosFromSquare(1) - getPosFromSquare(0);
-		int shiftAmount = offset * squareSize;
-		InstrumentClip* clip = getCurrentClip();
-
-		char modelStackMemory[MODEL_STACK_MAX_SIZE];
-		ModelStackWithTimelineCounter* modelStack = currentSong->setupModelStackWithCurrentClip(modelStackMemory);
-
-		clip->shiftHorizontally(modelStack, shiftAmount);
-		uiNeedsRendering(this, 0xFFFFFFFF, 0);
-
-		// If possible, just modify a previous Action to add this new shift amount to it.
-		Action* action = actionLogger.firstAction[BEFORE];
-		if (action && action->type == ACTION_INSTRUMENT_CLIP_HORIZONTAL_SHIFT && action->openForAdditions
-		    && action->currentClip == clip) {
-
-			// If there's no Consequence in the Action, that's probably because we deleted it a previous time with the code just below.
-			// Or possibly because the Action was created but there wasn't enough RAM to create the Consequence. Anyway, just go add a consequence now.
-			if (!action->firstConsequence) goto addConsequenceToAction;
-
-			ConsequenceInstrumentClipHorizontalShift* consequence =
-			    (ConsequenceInstrumentClipHorizontalShift*)action->firstConsequence;
-			consequence->amount += shiftAmount;
-
-			// It might look tempting that if we've completed one whole loop, we could delete the Consequence because everything would be back the same -
-			// but no! Remember different NoteRows might have different lengths.
-		}
-
-		// Or if no previous Action, go create a new one now.
-		else {
-
-			action = actionLogger.getNewAction(ACTION_INSTRUMENT_CLIP_HORIZONTAL_SHIFT, ACTION_ADDITION_NOT_ALLOWED);
-			if (action) {
-addConsequenceToAction:
-				void* consMemory = generalMemoryAllocator.alloc(sizeof(ConsequenceInstrumentClipHorizontalShift));
-
-				if (consMemory) {
-					ConsequenceInstrumentClipHorizontalShift* newConsequence =
-					    new (consMemory) ConsequenceInstrumentClipHorizontalShift(shiftAmount);
-					action->addConsequence(newConsequence);
-				}
-			}
-		}
-		return ACTION_RESULT_DEALT_WITH;
-	}
-
 	// Or, let parent deal with it
 	else {
 		return ClipView::horizontalEncoderAction(offset);

src/deluge/model/action/action.h

@@ -61,7 +61,7 @@ class ModelStack;
 #define ACTION_ARRANGEMENT_TIME_CONTRACT 17
 #define ACTION_ARRANGEMENT_CLEAR 18
 #define ACTION_ARRANGEMENT_RECORD 19
-#define ACTION_INSTRUMENT_CLIP_HORIZONTAL_SHIFT 20
+#define ACTION_CLIP_HORIZONTAL_SHIFT 20
 #define ACTION_NOTE_NUDGE 21
 #define ACTION_NOTE_REPEAT_EDIT 22
 #define ACTION_EUCLIDEAN_NUM_EVENTS_EDIT 23

src/deluge/model/clip/clip.h

@@ -129,6 +129,8 @@ class Clip : public TimelineCounter {
 	void setSequenceDirectionMode(ModelStackWithTimelineCounter* modelStack, int newSequenceDirection);
 	bool possiblyCloneForArrangementRecording(ModelStackWithTimelineCounter* modelStack);
 	virtual void incrementPos(ModelStackWithTimelineCounter* modelStack, int32_t numTicks);
+	/// Return true if successfully shifted
+	virtual bool shiftHorizontally(ModelStackWithTimelineCounter* modelStack, int amount) = 0;
 
 	// ----- PlayPositionCounter implementation -------
 	int32_t getLoopLength();

src/deluge/model/clip/instrument_clip.cpp

@@ -2941,7 +2941,7 @@ NoteRow* InstrumentClip::getNoteRowFromId(int id) {
 	}
 }
 
-void InstrumentClip::shiftHorizontally(ModelStackWithTimelineCounter* modelStack, int amount) {
+bool InstrumentClip::shiftHorizontally(ModelStackWithTimelineCounter* modelStack, int amount) {
 
 	if (paramManager.containsAnyParamCollectionsIncludingExpression()) {
 		paramManager.shiftHorizontally(
@@ -2959,6 +2959,7 @@ void InstrumentClip::shiftHorizontally(ModelStackWithTimelineCounter* modelStack
 		expectEvent();
 		reGetParameterAutomation(modelStack); // Re-gets all NoteRow-level param automation too
 	}
+	return true;
 }
 
 void InstrumentClip::shiftOnlyOneNoteRowHorizontally(ModelStackWithNoteRow* modelStack, int shiftAmount) {

src/deluge/model/clip/instrument_clip.h

@@ -92,7 +92,8 @@ class InstrumentClip final : public Clip {
 	void restoreBackedUpParamManagerMIDI(ModelStackWithModControllable* modelStack);
 	int getNoteRowId(NoteRow* noteRow, int noteRowIndex);
 	NoteRow* getNoteRowFromId(int id);
-	void shiftHorizontally(ModelStackWithTimelineCounter* modelStack, int amount);
+	/// Return true if successfully shifted. Instrument clips always succeed
+	bool shiftHorizontally(ModelStackWithTimelineCounter* modelStack, int amount);
 	bool containsAnyNotes();
 	ModelStackWithNoteRow* getNoteRowOnScreen(int yDisplay, ModelStackWithTimelineCounter* modelStack);
 	NoteRow* getNoteRowOnScreen(int yDisplay, Song* song, int* getIndex = NULL);

src/deluge/model/consequence/consequence_instrument_clip_horizontal_shift.cpp → src/deluge/model/consequence/consequence_clip_horizontal_shift.cpp

@@ -15,17 +15,16 @@
  * If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include "model/consequence/consequence_instrument_clip_horizontal_shift.h"
+#include "model/consequence/consequence_clip_horizontal_shift.h"
 #include "model/song/song.h"
-#include "model/clip/instrument_clip.h"
-#include "model/clip/audio_clip.h"
+#include "model/clip/clip.h"
 #include "model/model_stack.h"
 
-ConsequenceInstrumentClipHorizontalShift::ConsequenceInstrumentClipHorizontalShift(int32_t newAmount) {
+ConsequenceClipHorizontalShift::ConsequenceClipHorizontalShift(int32_t newAmount) {
 	amount = newAmount;
 }
 
-int ConsequenceInstrumentClipHorizontalShift::revert(int time, ModelStack* modelStack) {
+int ConsequenceClipHorizontalShift::revert(int time, ModelStack* modelStack) {
 
 	int32_t amountNow = amount;
 
@@ -36,14 +35,8 @@ int ConsequenceInstrumentClipHorizontalShift::revert(int time, ModelStack* model
 	ModelStackWithTimelineCounter* modelStackWithTimelineCounter =
 	    modelStack->addTimelineCounter(modelStack->song->currentClip);
 
-	Clip* clip = (Clip*)modelStackWithTimelineCounter->getTimelineCounter();
-
-	if (clip->type == CLIP_TYPE_INSTRUMENT) {
-		((InstrumentClip*)clip)->shiftHorizontally(modelStackWithTimelineCounter, amountNow);
-	}
-	else if (clip->type == CLIP_TYPE_AUDIO) {
-		((AudioClip*)clip)->shiftHorizontally(modelStackWithTimelineCounter, amountNow);
-	}
+	((Clip*)modelStackWithTimelineCounter->getTimelineCounter())
+	    ->shiftHorizontally(modelStackWithTimelineCounter, amountNow);
 
 	return NO_ERROR;
 }

src/deluge/model/consequence/consequence_instrument_clip_horizontal_shift.h → src/deluge/model/consequence/consequence_clip_horizontal_shift.h

@@ -15,18 +15,18 @@
  * If not, see <https://www.gnu.org/licenses/>.
 */
 
-#ifndef CONSEQUENCEINSTRUMENTCLIPHORIZONTALSHIFT_H_
-#define CONSEQUENCEINSTRUMENTCLIPHORIZONTALSHIFT_H_
+#ifndef CONSEQUENCECLIPHORIZONTALSHIFT_H_
+#define CONSEQUENCECLIPHORIZONTALSHIFT_H_
 
 #include "model/consequence/consequence.h"
 #include "RZA1/system/r_typedefs.h"
 
-class ConsequenceInstrumentClipHorizontalShift final : public Consequence {
+class ConsequenceClipHorizontalShift final : public Consequence {
 public:
-	ConsequenceInstrumentClipHorizontalShift(int32_t newAmount);
+	ConsequenceClipHorizontalShift(int32_t newAmount);
 	int revert(int time, ModelStack* modelStack);
 
 	int32_t amount;
 };
 
-#endif /* CONSEQUENCEINSTRUMENTCLIPHORIZONTALSHIFT_H_ */
+#endif /* CONSEQUENCECLIPHORIZONTALSHIFT_H_ */

toolchain/REQUIRED_VERSION

@@ -1 +1 @@
-8
+9