Add song transposition feature

juzzlin · juzzlin · commit 1ff4ceba7895 · 2026-04-13T01:34:52.000+03:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,9 @@ Release date:
 
 New features:
 
+* Add song transposition feature
+  - Fixes also drum track not taken into account properly
+
 Bug fixes:
 
 Other:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -264,6 +264,7 @@ set(QML_SOURCE_FILES
     ${QML_BASE_DIR}/Editor/MainContextMenu_Line.qml
     ${QML_BASE_DIR}/Editor/MainContextMenu_Pattern.qml
     ${QML_BASE_DIR}/Editor/MainContextMenu_Selection.qml
+    ${QML_BASE_DIR}/Editor/MainContextMenu_Song.qml
     ${QML_BASE_DIR}/Editor/MainContextMenu_Track.qml
     ${QML_BASE_DIR}/Editor/MouseHandler.qml
     ${QML_BASE_DIR}/Editor/MuteSoloButtons.qml
diff --git a/src/application/service/editor_service.cpp b/src/application/service/editor_service.cpp
@@ -1659,6 +1659,16 @@ void EditorService::requestPatternTranspose(int semitones)
     }
 }
 
+void EditorService::requestSongTranspose(int semitones)
+{
+    if (auto changes = m_song->transposeSong(semitones); !changes.empty()) {
+        m_undoStack->push(std::make_shared<NoteEditCommand>(m_song, std::move(changes), m_state.cursorPosition, m_state.cursorPosition, [this](const Position & pos) {
+            emit noteDataAtPositionChanged(pos);
+            setIsModified(true);
+        }, [this](const Position & pos) { requestPosition(pos); }));
+    }
+}
+
 void EditorService::requestSelectionCut()
 {
     juzzlin::L(TAG).info() << "Requesting selection cut";
diff --git a/src/application/service/editor_service.hpp b/src/application/service/editor_service.hpp
@@ -207,6 +207,7 @@ class EditorService : public QObject
     virtual Q_INVOKABLE void requestPatternCopy();
     virtual Q_INVOKABLE void requestPatternPaste();
     virtual Q_INVOKABLE void requestPatternTranspose(int semitones);
+    virtual Q_INVOKABLE void requestSongTranspose(int semitones);
     virtual Q_INVOKABLE bool hasPatternToPaste() const;
 
     virtual Q_INVOKABLE void requestSelectionCut();
diff --git a/src/domain/pattern.cpp b/src/domain/pattern.cpp
@@ -51,6 +51,22 @@ std::unique_ptr<Pattern> Pattern::copyWithoutData(size_t newPatternIndex) const
     return std::make_unique<Pattern>(newPatternIndex, patternConfig());
 }
 
+void Pattern::copySettingsFrom(const Pattern & other)
+{
+    for (const auto & track : other.m_trackOrder) {
+        if (auto myTrack = trackByIndex(track->index()); myTrack) {
+            myTrack->setName(track->name());
+            myTrack->setInstrument(track->instrument());
+            for (size_t column = 0; column < track->columnCount(); ++column) {
+                if (column < myTrack->columnCount()) {
+                    myTrack->setColumnName(column, track->columnName(column));
+                    myTrack->setColumnSettings(column, track->columnSettings(column));
+                }
+            }
+        }
+    }
+}
+
 Pattern::PatternConfig Pattern::patternConfig() const
 {
     PatternConfig config;
@@ -372,11 +388,14 @@ Pattern::PositionList Pattern::insertNoteDataAtPosition(const NoteData & noteDat
     return trackByIndexThrow(position.track)->insertNoteDataAtPosition(noteData, position);
 }
 
-NoteChangeList Pattern::transposePattern(const Position & position, int semitones) const
+NoteChangeList Pattern::transposePattern(const Position & position, int semitones, const DrumTracks & drumTracks) const
 {
     NoteChangeList changes;
     for (const auto & track : m_trackOrder) {
-        if (track->instrument() && track->instrument()->settings().drumTrack) {
+        if (drumTracks.contains(track->index())) {
+            continue;
+        }
+        if (drumTracks.empty() && track->instrument() && track->instrument()->settings().drumTrack) {
             continue;
         }
         auto trackPosition = position;
diff --git a/src/domain/pattern.hpp b/src/domain/pattern.hpp
@@ -19,6 +19,7 @@
 #include <map>
 #include <memory>
 #include <optional>
+#include <set>
 #include <vector>
 
 #include "note_data.hpp"
@@ -110,7 +111,8 @@ class Pattern
     PositionList deleteNoteDataAtPosition(const Position & position);
     PositionList insertNoteDataAtPosition(const NoteData & noteData, const Position & position);
 
-    NoteChangeList transposePattern(const Position & position, int semitones) const;
+    using DrumTracks = std::set<size_t>;
+    NoteChangeList transposePattern(const Position & position, int semitones, const DrumTracks & drumTracks = {}) const;
     NoteChangeList transposeTrack(const Position & position, int semitones) const;
     NoteChangeList transposeColumn(const Position & position, int semitones) const;
 
@@ -127,6 +129,7 @@ class Pattern
     static PatternU deserializeFromXml(QXmlStreamReader & reader);
 
     std::unique_ptr<Pattern> copyWithoutData(size_t newPatternIndex) const;
+    void copySettingsFrom(const Pattern & other);
 
     PatternConfig patternConfig() const;
 
diff --git a/src/domain/song.cpp b/src/domain/song.cpp
@@ -74,6 +74,11 @@ Song::ChangedPositions Song::pasteColumn(size_t patternIndex, size_t trackIndex,
 
 NoteChangeList Song::transposeColumn(const Position & position, int semitones) const
 {
+    if (m_patterns.contains(0)) {
+        if (auto inst = m_patterns.at(0)->instrument(position.track); inst && inst->settings().drumTrack) {
+            return {};
+        }
+    }
     return m_patterns.contains(position.pattern) ? m_patterns.at(position.pattern)->transposeColumn(position, semitones) : NoteChangeList {};
 }
 
@@ -103,6 +108,11 @@ Song::ChangedPositions Song::pasteTrack(size_t patternIndex, size_t trackIndex,
 
 NoteChangeList Song::transposeTrack(const Position & position, int semitones) const
 {
+    if (m_patterns.contains(0)) {
+        if (auto inst = m_patterns.at(0)->instrument(position.track); inst && inst->settings().drumTrack) {
+            return {};
+        }
+    }
     return m_patterns.contains(position.pattern) ? m_patterns.at(position.pattern)->transposeTrack(position, semitones) : NoteChangeList {};
 }
 
@@ -132,7 +142,34 @@ Song::ChangedPositions Song::pastePattern(size_t patternIndex, CopyManager & cop
 
 NoteChangeList Song::transposePattern(const Position & position, int semitones) const
 {
-    return m_patterns.contains(position.pattern) ? m_patterns.at(position.pattern)->transposePattern(position, semitones) : NoteChangeList {};
+    Pattern::DrumTracks drumTracks;
+    const auto masterPattern = m_patterns.at(0);
+    for (size_t trackIndex : masterPattern->trackIndices()) {
+        if (auto inst = masterPattern->instrument(trackIndex); inst && inst->settings().drumTrack) {
+            drumTracks.insert(trackIndex);
+        }
+    }
+    return m_patterns.contains(position.pattern) ? m_patterns.at(position.pattern)->transposePattern(position, semitones, drumTracks) : NoteChangeList {};
+}
+
+NoteChangeList Song::transposeSong(int semitones) const
+{
+    Pattern::DrumTracks drumTracks;
+    const auto masterPattern = m_patterns.at(0);
+    for (size_t trackIndex : masterPattern->trackIndices()) {
+        if (auto inst = masterPattern->instrument(trackIndex); inst && inst->settings().drumTrack) {
+            drumTracks.insert(trackIndex);
+        }
+    }
+
+    NoteChangeList changes;
+    for (auto && [index, pattern] : m_patterns) {
+        Position position;
+        position.pattern = index;
+        auto patternChanges = pattern->transposePattern(position, semitones, drumTracks);
+        changes.insert(changes.end(), patternChanges.begin(), patternChanges.end());
+    }
+    return changes;
 }
 
 Song::ChangedPositions Song::cutSelection(PositionListCR positions, CopyManager & copyManager, const AutomationService & automationService) const
diff --git a/src/domain/song.hpp b/src/domain/song.hpp
@@ -80,6 +80,7 @@ class Song
     ChangedPositions copyPattern(size_t patternIndex, CopyManager & copyManager, const AutomationService & automationService) const;
     ChangedPositions pastePattern(size_t patternIndex, CopyManager & copyManager) const;
     NoteChangeList transposePattern(const Position & position, int semitones) const;
+    NoteChangeList transposeSong(int semitones) const;
 
     using PositionList = std::vector<Position>;
     using PositionListCR = const PositionList &;
diff --git a/src/unit_tests/editor_service_test/editor_service_test.cpp b/src/unit_tests/editor_service_test/editor_service_test.cpp
@@ -1026,6 +1026,24 @@ void EditorServiceTest::test_requestPatternTranspose_shouldTransposePattern()
     QCOMPARE(editorService.displayVelocityAtPosition(0, 1, 0, 0), "064");
 }
 
+void EditorServiceTest::test_requestSongTranspose_shouldTransposeSong()
+{
+    EditorService editorService { std::make_shared<SelectionService>(), std::make_shared<SettingsService>(), std::make_shared<AutomationService>(std::make_shared<PropertyService>()) };
+    QSignalSpy noteDataChangedSpy { &editorService, &EditorService::noteDataAtPositionChanged };
+
+    QVERIFY(editorService.requestPosition(0, 0, 0, 0, 0));
+    QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 64)); // C-3
+
+    editorService.setCurrentPattern(1);
+    QVERIFY(editorService.requestPosition(1, 1, 0, 0, 0));
+    QVERIFY(editorService.requestNoteOnAtCurrentPosition(3, 3, 64)); // D-3
+
+    editorService.requestSongTranspose(1);
+
+    QCOMPARE(editorService.displayNoteAtPosition(0, 0, 0, 0), "C#3");
+    QCOMPARE(editorService.displayNoteAtPosition(1, 1, 0, 0), "D#3");
+}
+
 void EditorServiceTest::test_requestSelectionTranspose_shouldTransposeSelection()
 {
     const auto selectionService = std::make_shared<SelectionService>();
diff --git a/src/unit_tests/editor_service_test/editor_service_test.hpp b/src/unit_tests/editor_service_test/editor_service_test.hpp
@@ -80,6 +80,7 @@ private slots:
     void test_requestColumnTranspose_shouldTransposeColumn();
     void test_requestTrackTranspose_shouldTransposeTrack();
     void test_requestPatternTranspose_shouldTransposePattern();
+    void test_requestSongTranspose_shouldTransposeSong();
     void test_requestSelectionTranspose_shouldTransposeSelection();
 
     void test_requestLinearVelocityInterpolationOnColumn_shouldInterpolateVelocities();
diff --git a/src/unit_tests/song_test/song_test.cpp b/src/unit_tests/song_test/song_test.cpp
@@ -990,6 +990,50 @@ void SongTest::test_transposePattern_drumTrackSet_shouldNotTransposeDrumTrack()
     QCOMPARE(it1->newNoteData.note().value(), 61);
 }
 
+void SongTest::test_transposeSong_drumTrackSet_shouldNotTransposeDrumTrack()
+{
+    Song song;
+
+    // Setup Track 0 as Drum Track
+    auto drumInstrument = std::make_shared<Instrument>("");
+    auto drumSettings = drumInstrument->settings();
+    drumSettings.drumTrack = true;
+    drumInstrument->setSettings(drumSettings);
+    song.setInstrument(0, drumInstrument);
+
+    // Setup Track 1 as normal track
+    auto normalInstrument = std::make_shared<Instrument>("");
+    song.setInstrument(1, normalInstrument);
+
+    // Create a second pattern
+    song.createPattern(1);
+
+    // Add note to Track 0 (should NOT be transposed) in pattern 0
+    const Position pos0p0 = { 0, 0, 0, 0, 0 };
+    song.noteDataAtPosition(pos0p0)->setAsNoteOn(60, 100);
+
+    // Add note to Track 1 (should be transposed) in pattern 1
+    const Position pos1p1 = { 1, 1, 0, 0, 0 };
+    song.noteDataAtPosition(pos1p1)->setAsNoteOn(60, 100);
+
+    // Transpose song by 1 semitone
+    const auto changes = song.transposeSong(1);
+
+    // Check results
+    // pos0p0 (Drum Track) should NOT be in changes
+    const auto it0 = std::find_if(changes.begin(), changes.end(), [&](auto && change) {
+        return change.position == pos0p0;
+    });
+    QVERIFY(it0 == changes.end());
+
+    // pos1p1 (Normal Track) SHOULD be in changes
+    const auto it1 = std::find_if(changes.begin(), changes.end(), [&](auto && change) {
+        return change.position == pos1p1;
+    });
+    QVERIFY(it1 != changes.end());
+    QCOMPARE(it1->newNoteData.note().value(), 61);
+}
+
 void SongTest::test_duration_skippedPattern_shouldReturnCorrectDuration()
 {
     Song song;
diff --git a/src/unit_tests/song_test/song_test.hpp b/src/unit_tests/song_test/song_test.hpp
@@ -70,6 +70,7 @@ private slots:
     void test_trackIndexByPosition_and_trackPositionByIndex();
 
     void test_transposePattern_drumTrackSet_shouldNotTransposeDrumTrack();
+    void test_transposeSong_drumTrackSet_shouldNotTransposeDrumTrack();
 
     void test_duration_skippedPattern_shouldReturnCorrectDuration();
 
diff --git a/src/view/qml/Editor/MainContextMenu.qml b/src/view/qml/Editor/MainContextMenu.qml
@@ -15,6 +15,8 @@ Menu {
     MenuSeparator {}
     MainContextMenu_Selection {}
     MenuSeparator {}
+    MainContextMenu_Song {}
+    MenuSeparator {}
     Action {
         text: qsTr("Edit MIDI CC automations (ALL)")
         enabled: !UiService.isPlaying()
diff --git a/src/view/qml/Editor/MainContextMenu_Song.qml b/src/view/qml/Editor/MainContextMenu_Song.qml
@@ -0,0 +1,50 @@
+import QtQuick.Controls 2.15
+import QtQuick.Controls.Universal 2.15
+import ".."
+import "../Components"
+
+Menu {
+    title: qsTr("Song")
+    width: rootItem.width
+    Action {
+        text: qsTr("Transpose <b>+1</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(1)
+    }
+    Action {
+        text: qsTr("Transpose <b>-1</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(-1)
+    }
+    Action {
+        text: qsTr("Transpose <b>+2</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(2)
+    }
+    Action {
+        text: qsTr("Transpose <b>-2</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(-2)
+    }
+    Action {
+        text: qsTr("Transpose <b>+6</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(6)
+    }
+    Action {
+        text: qsTr("Transpose <b>-6</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(-6)
+    }
+    Action {
+        text: qsTr("Transpose <b>+12</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(12)
+    }
+    Action {
+        text: qsTr("Transpose <b>-12</b> semitones")
+        enabled: !UiService.isPlaying()
+        onTriggered: editorService.requestSongTranspose(-12)
+    }
+    delegate: MenuItemDelegate {}
+}

Original file line number	Diff line number	Diff line change
`@@ -1659,6 +1659,16 @@ void EditorService::requestPatternTranspose(int semitones)`
`1659`	`1659`	`}`
`1660`	`1660`	`}`
`1661`	`1661`
	`1662`	`+void EditorService::requestSongTranspose(int semitones)`
	`1663`	`+{`
	`1664`	`+ if (auto changes = m_song->transposeSong(semitones); !changes.empty()) {`
	`1665`	`+ m_undoStack->push(std::make_shared<NoteEditCommand>(m_song, std::move(changes), m_state.cursorPosition, m_state.cursorPosition, [this](const Position & pos) {`
	`1666`	`+ emit noteDataAtPositionChanged(pos);`
	`1667`	`+ setIsModified(true);`
	`1668`	`+ }, [this](const Position & pos) { requestPosition(pos); }));`
	`1669`	`+ }`
	`1670`	`+}`
	`1671`	`+`
`1662`	`1672`	`void EditorService::requestSelectionCut()`
`1663`	`1673`	`{`
`1664`	`1674`	`juzzlin::L(TAG).info() << "Requesting selection cut";`