Add seq block split actions

src/audioCore/action/ActionOther.cpp

@@ -355,3 +355,43 @@ bool ActionSynth::doAction() {
  this->error("Can't synth: [" + juce::String{ this->index } + "]\n");
  return false;
 }
+
+ActionSplitSequencerBlock::ActionSplitSequencerBlock(
+ int track, int block, double time)
+ : ACTION_DB{ track, block, time } {}
+
+bool ActionSplitSequencerBlock::doAction() {
+ ACTION_UNSAVE_PROJECT();
+
+ ACTION_WRITE_TYPE(ActionSplitSequencerBlock);
+ ACTION_WRITE_DB();
+
+ if (auto graph = AudioCore::getInstance()->getGraph()) {
+ if (auto track = graph->getSourceProcessor(ACTION_DATA(track))) {
+ if (track->splitSeq(ACTION_DATA(block), ACTION_DATA(time))) {
+ this->output("Split seq block: [" + juce::String(ACTION_DATA(track)) + ", " + juce::String{ ACTION_DATA(block) } + "]\n");
+ ACTION_RESULT(true);
+ }
+ }
+ }
+ this->output("Can't split seq block: [" + juce::String(ACTION_DATA(track)) + ", " + juce::String{ ACTION_DATA(block) } + "]\n");
+ ACTION_RESULT(false);
+}
+
+bool ActionSplitSequencerBlock::undo() {
+ ACTION_UNSAVE_PROJECT();
+
+ ACTION_WRITE_TYPE_UNDO(ActionSplitSequencerBlock);
+ ACTION_WRITE_DB();
+
+ if (auto graph = AudioCore::getInstance()->getGraph()) {
+ if (auto track = graph->getSourceProcessor(ACTION_DATA(track))) {
+ if (track->stickSeqWithNext(ACTION_DATA(block))) {
+ this->output("Undo split seq block: [" + juce::String(ACTION_DATA(track)) + ", " + juce::String{ ACTION_DATA(block) } + "]\n");
+ ACTION_RESULT(true);
+ }
+ }
+ }
+ this->output("Can't undo split seq block: [" + juce::String(ACTION_DATA(track)) + ", " + juce::String{ ACTION_DATA(block) } + "]\n");
+ ACTION_RESULT(false);
+}

src/audioCore/action/ActionOther.h

@@ -299,3 +299,24 @@ class ActionSynth final : public ActionBase {
 
  JUCE_LEAK_DETECTOR(ActionSynth)
 };
+
+class ActionSplitSequencerBlock final : public ActionUndoableBase {
+public:
+ ActionSplitSequencerBlock() = delete;
+ ActionSplitSequencerBlock(
+ int track, int block, double time);
+
+ bool doAction() override;
+ bool undo() override;
+ const juce::String getName() override {
+ return "Split Sequencer Track Block";
+ };
+
+private:
+ ACTION_DATABLOCK{
+ const int track, block;
+ const double time;
+ } ACTION_DB;
+
+ JUCE_LEAK_DETECTOR(ActionSplitSequencerBlock)
+};

src/audioCore/graph/SeqSourceProcessor.cpp

@@ -82,6 +82,14 @@ const SourceList::SeqBlock SeqSourceProcessor::getSeq(int index) const {
  return this->srcs.get(index);
 }
 
+bool SeqSourceProcessor::splitSeq(int index, double time) {
+ return this->srcs.split(index, time);
+}
+
+bool SeqSourceProcessor::stickSeqWithNext(int index) {
+ return this->srcs.stickWithNext(index);
+}
+
 void SeqSourceProcessor::setTrackName(const juce::String& name) {
  this->trackName = name;
 

src/audioCore/graph/SeqSourceProcessor.h

@@ -18,6 +18,8 @@ class SeqSourceProcessor final : public juce::AudioProcessorGraph,
  void removeSeq(int index);
  int getSeqNum() const;
  const SourceList::SeqBlock getSeq(int index) const;
+ bool splitSeq(int index, double time);
+ bool stickSeqWithNext(int index);
 
  void setTrackName(const juce::String& name);
  const juce::String getTrackName() const;

src/audioCore/graph/SourceList.cpp

@@ -126,6 +126,56 @@ void SourceList::remove(int index) {
  }
 }
 
+bool SourceList::split(int index, double time) {
+ juce::ScopedWriteLock locker(audioLock::getAudioLock());
+
+ if (index >= 0 && index < this->list.size()) {
+ auto [startTime, endTime, offset] = this->list.getUnchecked(index);
+ if (startTime < time && time < endTime) {
+ this->list.remove(index);
+
+ this->list.insert(index, { startTime, time, offset });
+ this->list.insert(index + 1, { time, endTime, offset });
+
+ /** Callback */
+ UICallbackAPI<int, int>::invoke(
+ UICallbackType::SeqBlockChanged, this->index, index);
+ UICallbackAPI<int, int>::invoke(
+ UICallbackType::SeqBlockChanged, this->index, index + 1);
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool SourceList::stickWithNext(int index) {
+ juce::ScopedWriteLock locker(audioLock::getAudioLock());
+
+ if (index >= 0 && index < this->list.size() - 1) {
+ auto [startTimeFirst, endTimeFirst, offsetFirst] = this->list.getUnchecked(index);
+ auto [startTimeSecond, endTimeSecond, offsetSecond] = this->list.getUnchecked(index + 1);
+ if (juce::approximatelyEqual(offsetFirst, offsetSecond) &&
+ juce::approximatelyEqual(endTimeFirst, startTimeSecond)) {
+ this->list.remove(index + 1);
+ this->list.remove(index);
+
+ this->list.insert(index, { startTimeFirst, endTimeSecond, offsetFirst });
+
+ /** Callback */
+ UICallbackAPI<int, int>::invoke(
+ UICallbackType::SeqBlockChanged, this->index, index);
+ UICallbackAPI<int, int>::invoke(
+ UICallbackType::SeqBlockChanged, this->index, index + 1);
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
 void SourceList::clearGraph() {
  juce::ScopedWriteLock locker(audioLock::getAudioLock());
  this->list.clear();

src/audioCore/graph/SourceList.h

@@ -35,6 +35,9 @@ class SourceList final : public Serializable {
  int add(const SeqBlock& block);
  void remove(int index);
 
+ bool split(int index, double time);
+ bool stickWithNext(int index);
+
  void clearGraph();
 
 public:

src/audioCore/recovery/ActionType.hpp

@@ -18,6 +18,7 @@ enum class ActionType : unsigned int {
  ActionAddTempoBeat,
 
  ActionSave = 0x0101,
+ ActionSplitSequencerBlock,
 
  ActionRemoveMixerTrack = 0x0201,
  ActionRemoveMixerTrackSend,