Skip to content

AudioKit/AudioKit#2955 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

AudioKit/AudioKit#2955 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfc2dfa
Revise existing test for AudioKit/AudioKit#2955
emurray2 Apr 22, 2025
65d4203
Revise existing code for AudioKit/AudioKit#2955
emurray2 Apr 22, 2025
f91d65c
Test original behavior too
emurray2 Apr 22, 2025
1b4cba0
Make comment clear
emurray2 Jul 8, 2025
97c95e4
Add another test case for track length
emurray2 Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/AudioKitEX/Sequencing/Sequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public struct NoteEventSequence: Equatable {
channel: MIDIChannel = 0,
position: Double,
duration: Double) {
totalDuration += duration
totalDuration = max(totalDuration, position + duration) // Compare latest note position and duration to current totalDuration.
var newNote = SequenceNote()

newNote.noteOn.status = noteOnByte
Expand Down
13 changes: 13 additions & 0 deletions Tests/AudioKitEXTests/SequencerTrackTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,24 @@ class SequencerTrackTests: XCTestCase {
let track = SequencerTrack(targetNode: sampler)
engine.output = sampler

track.add(noteNumber: 60, position: 0.0, duration: 1.0)
track.add(noteNumber: 60, position: 0.0, duration: 1.0)
track.add(noteNumber: 60, position: 0.0, duration: 1.0)
track.add(noteNumber: 60, position: 0.0, duration: 1.0)

XCTAssertEqual(track.length, 4, "Track length shouldn't be extended with chord duration less than existing track length")

track.add(noteNumber: 60, position: 0.0, duration: 1.0)
track.add(noteNumber: 60, position: 1.0, duration: 1.0)
track.add(noteNumber: 60, position: 2.0, duration: 1.0)
track.add(noteNumber: 60, position: 3.0, duration: 1.0)

XCTAssertEqual(track.length, 4.01, "Track length should be extended with note event position + duration greater or equal to existing track length")

track.add(noteNumber: 60, position: 1.0, duration: 5.0)

XCTAssertEqual(track.length, 6.01, "Track length should be extended with note event position + duration greater or equal to existing track length")

track.playFromStart()
XCTAssertTrue(track.isPlaying)
let audio = engine.startTest(totalDuration: 5.0)
Expand Down
2 changes: 1 addition & 1 deletion Tests/AudioKitEXTests/ValidatedMD5s.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let validatedMD5s: [String: String] = [
"-[SequencerTrackTests testLoop]": "3a7ebced69ddc6669932f4ee48dabe2b",
"-[SequencerTrackTests testOneShot]": "3fbf53f1139a831b3e1a284140c8a53c",
"-[SequencerTrackTests testTempo]": "1eb7efc6ea54eafbe616dfa8e1a3ef36",
"-[SequencerTrackTests testNoteBounds]": "6679c7b949d28130549c6a1eb4ceaf59",
"-[SequencerTrackTests testNoteBounds]": "f3b3935e30380367c15652c0a76a8a57",
"-[DryWetMixerTests testBalance0]": "789c1e77803a4f9d10063eb60ca03cea",
"-[DryWetMixerTests testBalance1]": "3932bc5d49cbefd4a9dd587d16f4b81c",
"-[DryWetMixerTests testDefault]": "45a639729d8698a28f134bbe4ccc9d6c",
Expand Down
Loading