removed unwanted bar now with waveforms, major updates

This commit is contained in:
Mark Gregory
2026-11-06 10:42:21 +00:00
parent 15c9f5914d
commit f947308421
10 changed files with 695 additions and 105 deletions
+140 -10
View File
@@ -1351,23 +1351,35 @@ final class KJamsCloneTests: XCTestCase {
defer { window.orderOut(nil);window.contentView = nil;previous?.makeKey() }
try await Task.sleep(nanoseconds:200_000_000);host.layoutSubtreeIfNeeded();host.displayIfNeeded()
if let image = host.bitmapImageRepForCachingDisplay(in:host.bounds) { host.cacheDisplay(in:host.bounds,to:image) }
func click(_ x: Double,_ top: Double) async throws {
func descendants(_ view: NSView) -> [NSView] { [view]+view.subviews.flatMap{descendants($0)} }
let tabs = try XCTUnwrap(descendants(host).compactMap{$0 as? NSTabView}.first)
let rect = tabs.contentRect
let point = tabs.convert(NSPoint(x:rect.minX+x,y:tabs.isFlipped ? rect.minY+top : rect.maxY-top),to:nil)
if let bitmap = host.bitmapImageRepForCachingDisplay(in:host.bounds) { host.cacheDisplay(in:host.bounds,to:bitmap);try bitmap.representation(using:.png,properties:[:])?.write(to:URL(fileURLWithPath:"/private/tmp/kjmix-20261106-performance/sidebar.png")) }
func click(_ identifier: String) async throws {
var visited = Set<ObjectIdentifier>()
func find(_ node: NSObject,depth: Int = 0) -> NSObject? {
guard depth < 40,visited.insert(ObjectIdentifier(node)).inserted else { return nil }
if node.responds(to:NSSelectorFromString("accessibilityIdentifier")),node.value(forKey:"accessibilityIdentifier") as? String == identifier { return node }
if node.responds(to:NSSelectorFromString("accessibilityChildren")),let children = node.value(forKey:"accessibilityChildren") as? [NSObject] {
for child in children { if let found = find(child,depth:depth+1) { return found } }
}
return nil
}
host.layoutSubtreeIfNeeded()
let button = try XCTUnwrap(find(host),"Find the actual button by accessibility identifier instead of assuming a fixed sidebar row position")
let frame = try XCTUnwrap(button.value(forKey:"accessibilityFrame") as? NSValue).rectValue
let point = window.convertPoint(fromScreen:NSPoint(x:frame.midX,y:frame.midY))
for type in [NSEvent.EventType.leftMouseDown,.leftMouseUp] {
let event = try XCTUnwrap(NSEvent.mouseEvent(with:type,location:point,modifierFlags:[],timestamp:ProcessInfo.processInfo.systemUptime,windowNumber:window.windowNumber,context:nil,eventNumber:0,clickCount:1,pressure:type == .leftMouseDown ? 1 : 0))
NSApp.sendEvent(event)
}
try await Task.sleep(nanoseconds:90_000_000)
}
try await click(24,336)
model.expandedSingerIDs.remove(singer)
try await Task.sleep(nanoseconds:50_000_000)
try await click("singer.expand.\(singer)")
XCTAssertTrue(model.expandedSingerIDs.contains(singer),"Clicking the actual chevron must expand the singer")
try await click(100,153);XCTAssertEqual(model.activeSection,"Rotation")
try await click(100,116);XCTAssertEqual(model.activeSection,"Library")
try await click("nav.Rotation");XCTAssertEqual(model.activeSection,"Rotation")
try await click("nav.Library");XCTAssertEqual(model.activeSection,"Library")
XCTAssertTrue(model.expandedSingerIDs.contains(singer))
try await click(24,336)
try await click("singer.expand.\(singer)")
XCTAssertFalse(model.expandedSingerIDs.contains(singer));XCTAssertNil(model.error)
}
@@ -2650,7 +2662,7 @@ extension KJamsCloneTests {
XCTAssertFalse(player.playing)
XCTAssertTrue(player.audioPlaybackStarted,"Paused scrubbing must render an audio grain")
player.scrub(to:0.2)
XCTAssertEqual(player.time,0.2,accuracy:0.001)
XCTAssertEqual(player.time,0.5,accuracy:0.001,"Display stays with the audible grain until the next audio update")
player.endScrubbing()
XCTAssertFalse(player.audioPlaybackStarted);XCTAssertFalse(player.playing)
XCTAssertEqual(player.time,0.2,accuracy:0.001)
@@ -2742,4 +2754,122 @@ extension KJamsCloneTests {
XCTAssertEqual(player.time,0.69,accuracy:0.001)
}
func testConcurrentWaveformBatchSavesUniquePathsAndReusesDuplicates() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at:root) }
try FileManager.default.createDirectory(at:root,withIntermediateDirectories:true)
let fixture = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.wav"))
var songs = [Song]()
for i in 0..<4 {
let audio = root.appendingPathComponent("Track\(i).wav")
try FileManager.default.copyItem(at:fixture,to:audio)
songs.append(Song(id:Int64(i),title:"Track",audio:audio.path,cdg:nil,rating:0,plays:0))
}
var duplicate = songs[0];duplicate.id = 10;songs.append(duplicate)
let cache = root.appendingPathComponent("Cache")
let result = await WaveformBatch.runConcurrent(songs:songs,locations:[],cache:cache,force:true,limit:{2})
XCTAssertEqual(result.generated,4);XCTAssertEqual(result.cached,1);XCTAssertEqual(result.processed,5);XCTAssertEqual(result.issues,0)
let reused = await WaveformBatch.runConcurrent(songs:songs,locations:[],cache:cache,limit:{1})
XCTAssertEqual(reused.cached,5);XCTAssertEqual(reused.generated,0)
}
@MainActor func testWaveformAdmissionDropsToOneDuringPlayback() throws {
let policy = WaveformWorkload.shared,id = UUID()
policy.setPlaying(true,id:id)
XCTAssertEqual(policy.workers,1)
policy.setPlaying(false,id:id)
XCTAssertLessThanOrEqual(policy.workers,2)
}
@MainActor func testSharedDJGraphicEQAppliesAcrossLoadsAndPersists() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at:root) }
let system = DJSystem(storageURL:root)
defer { system.a.unload();system.b.unload() }
system.chooseGraphicPreset("Rock")
XCTAssertTrue(system.a.player.graphicEnabled)
XCTAssertEqual(system.a.player.graphicGains,system.b.player.graphicGains)
let fixture = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.wav"))
let song = Song(id:1,title:"Demo",audio:fixture.path,cdg:nil,rating:0,plays:0)
system.load(song,into:"A")
XCTAssertEqual(system.a.player.graphicGains,DJGraphicEQSettings.presets.first(where:{$0.0 == "Rock"})?.1)
system.graphicEQ.enabled = false
XCTAssertFalse(system.a.player.graphicEnabled);XCTAssertFalse(system.b.player.graphicEnabled)
try await Task.sleep(nanoseconds:300_000_000)
let reopened = DJSystem(storageURL:root)
XCTAssertEqual(reopened.graphicEQ,system.graphicEQ)
}
func testCentreVocalReductionRemovesCentreAndPreservesSideSignal() {
let centred = DJVocalReductionUnit.reduce(left:0.8,right:0.8,amount:1)
XCTAssertEqual(centred.0,0,accuracy:0.0001);XCTAssertEqual(centred.1,0,accuracy:0.0001)
let side = DJVocalReductionUnit.reduce(left:0.8,right:-0.8,amount:1)
XCTAssertEqual(side.0,0.8,accuracy:0.0001);XCTAssertEqual(side.1,0.8,accuracy:0.0001)
let bypass = DJVocalReductionUnit.reduce(left:0.6,right:0.2,amount:0)
XCTAssertEqual(bypass.0,0.6,accuracy:0.0001);XCTAssertEqual(bypass.1,0.2,accuracy:0.0001)
}
@MainActor func testDJNameReinterpretationUpdatesArtistAndUndo() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at:root) }
let system = DJSystem(storageURL:root)
let id = try XCTUnwrap(system.library?.add(title:"Example Artist - Example Song",audio:"/missing/example.mp3",cdg:nil))
try system.refresh()
let preview = try NameTemplate.preview(system.songs,template:"R - S",source:.song,emDashes:false,underscores:true)
try await system.applyNameChanges(preview.compactMap(\.change))
XCTAssertEqual(system.songs.first?.artist,"Example Artist");XCTAssertEqual(system.songs.first?.title,"Example Song")
try await system.undoNameChanges()
XCTAssertEqual(system.songs.first?.id,id);XCTAssertEqual(system.songs.first?.title,"Example Artist - Example Song")
}
@MainActor func testCentreVocalReductionProcessesLiveStereoAudio() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at:root) }
try FileManager.default.createDirectory(at:root,withIntermediateDirectories:true)
let format = try XCTUnwrap(AVAudioFormat(standardFormatWithSampleRate:44100,channels:2))
let buffer = try XCTUnwrap(AVAudioPCMBuffer(pcmFormat:format,frameCapacity:88200));buffer.frameLength = 88200
let data = try XCTUnwrap(buffer.floatChannelData)
for i in 0..<88200 { let value = Float(sin(Double(i)*2 * .pi*440/44100))*0.3;data[0][i] = value;data[1][i] = value }
let url = root.appendingPathComponent("Centred.wav")
do { let file = try AVAudioFile(forWriting:url,settings:format.settings);try file.write(from:buffer) }
let player = Player(waveformCacheDirectory:root,persistsMix:false)
defer { player.stop() }
player.autoFade = false;player.volume = 0.8
try player.load(Song(id:1,title:"Centred",audio:url.path,cdg:nil,rating:0,plays:0))
for _ in 0..<50 where player.scrubOutputLevel <= 0.01 { try await Task.sleep(nanoseconds:20_000_000) }
XCTAssertGreaterThan(player.scrubOutputLevel,0.01)
player.vocalReductionEnabled = true
for _ in 0..<70 where player.scrubOutputLevel >= 0.001 { try await Task.sleep(nanoseconds:10_000_000) }
XCTAssertLessThan(player.scrubOutputLevel,0.001)
XCTAssertTrue(player.playing)
player.vocalReductionEnabled = false
for _ in 0..<70 where player.scrubOutputLevel <= 0.01 { try await Task.sleep(nanoseconds:10_000_000) }
XCTAssertGreaterThan(player.scrubOutputLevel,0.01)
}
@MainActor func testShortLoopRunsOnAudioNodeAndClockWraps() async throws {
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
defer { try? FileManager.default.removeItem(at:root) }
let fixture = try XCTUnwrap(Bundle(for:Self.self).resourceURL?.appendingPathComponent("Fixtures/Demo.wav"))
let player = Player(waveformCacheDirectory:root,persistsMix:false)
defer { player.stop() }
player.autoFade = false
try player.load(Song(id:1,title:"Demo",audio:fixture.path,cdg:nil,rating:0,plays:0),startPlaying:false)
player.defineLoop(start:0.2,end:0.4)
for _ in 0..<100 where !player.nativeLoopActive { try await Task.sleep(nanoseconds:10_000_000) }
XCTAssertTrue(player.nativeLoopActive)
player.seek(0.25);player.toggle()
for _ in 0..<30 {
try await Task.sleep(nanoseconds:20_000_000)
XCTAssertTrue(player.audioPlaybackStarted);XCTAssertTrue(player.nativeLoopActive)
XCTAssertGreaterThanOrEqual(player.displayTime,0.2);XCTAssertLessThan(player.displayTime,0.401)
}
player.defineLoop(start:0.2,end:0.3)
try await Task.sleep(nanoseconds:100_000_000)
XCTAssertTrue(player.nativeLoopActive);XCTAssertLessThan(player.displayTime,0.301)
let exit = player.displayTime
player.loopEnabled = false
XCTAssertFalse(player.nativeLoopActive);XCTAssertTrue(player.playing)
XCTAssertEqual(player.time,exit,accuracy:0.03)
try await Task.sleep(nanoseconds:180_000_000)
XCTAssertGreaterThan(player.displayTime,0.3,"Loop Off must continue immediately past the previous loop end")
}
}