Add seq block split operation

Do-sth-sharp · Jun 3, 2024 · 27a2445 · 27a2445
1 parent e302cda
commit 27a2445
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/src/ui/component/sequencer/SeqTrackContentViewer.cpp b/src/ui/component/sequencer/SeqTrackContentViewer.cpp
@@ -3,6 +3,7 @@
 #include "../../misc/AudioExtractor.h"
 #include "../../misc/MainThreadPool.h"
 #include "../../misc/Tools.h"
+#include "../../misc/CoreActions.h"
 #include "../../Utils.h"
 #include "../../../audioCore/AC_API.h"
 
@@ -85,7 +86,7 @@ void SeqTrackContentViewer::update(int index) {
  }
 }
 
-void SeqTrackContentViewer::updateBlock(int blockIndex) {
+void SeqTrackContentViewer::updateBlock(int /*blockIndex*/) {
  /** Create Or Remove Block */
  int currentSize = this->blockTemp.size();
  int newSize = quickAPI::getBlockNum(this->index);
@@ -102,13 +103,8 @@ void SeqTrackContentViewer::updateBlock(int blockIndex) {
  }
 
  /** Update Blocks */
- if (blockIndex >= 0 && blockIndex < this->blockTemp.size()) {
- this->updateBlockInternal(blockIndex);
- }
- else {
- for (int i = 0; i < this->blockTemp.size(); i++) {
- this->updateBlockInternal(i);
- }
+ for (int i = 0; i < this->blockTemp.size(); i++) {
+ this->updateBlockInternal(i);
  }
 
  /** Repaint */
@@ -669,5 +665,5 @@ double SeqTrackContentViewer::limitTimeSec(double timeSec) {
 }
 
 void SeqTrackContentViewer::splitBlock(int blockIndex, double timeSec) {
- /** TODO */
+ CoreActions::splitSeqBlock(this->index, blockIndex, timeSec);
 }
diff --git a/src/ui/misc/CoreActions.cpp b/src/ui/misc/CoreActions.cpp
@@ -458,6 +458,24 @@ void CoreActions::setLabelBeat(int index, int numerator, int denominator) {
  ActionDispatcher::getInstance()->dispatch(std::move(action));
 }
 
+void CoreActions::insertSeqBlock(
+ int track, double startTime, double endTime, double offset) {
+ auto action = std::unique_ptr<ActionBase>(new ActionAddSequencerBlock{
+ track, startTime, endTime, offset });
+ ActionDispatcher::getInstance()->dispatch(std::move(action));
+}
+
+void CoreActions::splitSeqBlock(int track, int index, double time) {
+ auto action = std::unique_ptr<ActionBase>(new ActionSplitSequencerBlock{
+ track, index, time });
+ ActionDispatcher::getInstance()->dispatch(std::move(action));
+}
+
+void CoreActions::removeSeqBlock(int track, int index) {
+ auto action = std::unique_ptr<ActionBase>(new ActionRemoveSequencerBlock{ track, index });
+ ActionDispatcher::getInstance()->dispatch(std::move(action));
+}
+
 void CoreActions::loadProjectGUI(const juce::String& filePath) {
  if (!CoreActions::askForSaveGUI()) { return; }
 

diff --git a/src/ui/misc/CoreActions.h b/src/ui/misc/CoreActions.h
@@ -97,6 +97,10 @@ class CoreActions final {
  static void setLabelTempo(int index, double tempo);
  static void setLabelBeat(int index, int numerator, int denominator);
 
+ static void insertSeqBlock(int track, double startTime, double endTime, double offset);
+ static void splitSeqBlock(int track, int index, double time);
+ static void removeSeqBlock(int track, int index);
+
  static void loadProjectGUI(const juce::String& filePath);
  static void loadProjectGUI();
  static void newProjectGUI();