mag/KMix_Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broken changes

Browse Source
This commit is contained in:
Mark Gregory
2026-11-05 21:27:41 +00:00
parent 78c4411fa6
commit d348aa76ca
5 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KJamsClone/DJWorkstation.swift
+6 -19
View File
@@ -689,12 +689,7 @@ private enum DJStyle {
}
struct DJConsole: View {
@ObservedObject var model: AppModel
@ObservedObject var system: DJSystem
var expanded = false
@State private var settingsModal = false
@State private var routing = false
@State private var mapping = false
@State private var query = ""
@State private var playlist: Int64?
@State private var playlistIDs = [Int64]()
@@ -712,14 +707,13 @@ struct DJConsole: View {
private var pages: Int { max(1,(songs.count+49)/50) }
private var visible: [Song] { Array(songs.dropFirst(min(page,pages-1)*50).prefix(50)) }
var body: some View {
ScrollView {
VStack(spacing:10) {
header
DJContinuousConsole(system:system,loadA:{loadSelected("A")},loadB:{loadSelected("B")})
DJContinuousConsole(system:system,loadA:{loadSelected("A")},loadB:{loadSelected("B")}).fixedSize(horizontal:false,vertical:true)
HStack(alignment:.top,spacing:12) {
browser.frame(maxWidth:.infinity).frame(height:expanded ? 330 : 220)
DJQueuePane(system:system,automix:system.automix).frame(width:310,height:expanded ? 330 : 220)
}
browser.frame(maxWidth:.infinity,maxHeight:.infinity)
DJQueuePane(system:system,automix:system.automix).frame(width:310).frame(maxHeight:.infinity)
}.frame(maxWidth:.infinity,maxHeight:.infinity)
if let progress = system.importProgress {
HStack {
Text(progress.current).lineLimit(1);Text("\(progress.completed)/\(progress.total)").monospacedDigit()
@@ -728,9 +722,8 @@ struct DJConsole: View {
else { Button("Dismiss") { system.importProgress = nil } }
}.font(.caption).controlSize(.mini)
}
HStack { Text(system.status).lineLimit(1);Spacer();Text("DJ master separate from karaoke").foregroundStyle(.secondary) }.font(.system(size:10))
}.padding(14)
}.background(DJStyle.background).foregroundStyle(.white)
}.padding(14).frame(maxWidth:.infinity,maxHeight:.infinity,alignment:.top)
.background(DJStyle.background).foregroundStyle(.white)
.preferredColorScheme(.dark)
.alert("Replace playing track?",isPresented:Binding(get:{system.pendingReplacement != nil},set:{if !$0 { system.pendingReplacement = nil }}),presenting:system.pendingReplacement) { request in
Button("Cancel",role:.cancel) { system.cancelReplacement() }
@@ -738,9 +731,6 @@ struct DJConsole: View {
} message: { request in Text("Deck \(request.deck) is playing. Replacing it with \(request.title) stops the current track. Continue?") }
.sheet(isPresented:$system.cueEditing) { DJCueEditor(system:system) }
.sheet(isPresented:Binding(get:{system.loopEditor != nil},set:{if !$0 { system.loopEditor = nil }})) { let deck = system.channel(system.loopEditor ?? "A");DJLoopEditor(player:deck.player,letter:deck.letter) }
.sheet(isPresented:$settingsModal) { StudioSettingsDialog(model:model,scope:"DJ") }
.sheet(isPresented:$routing) { StudioSettingsDialog(model:model,scope:"DJ",category:"Devices") }
.sheet(isPresented:$mapping) { StudioSettingsDialog(model:model,scope:"DJ",category:"MIDI") }
.sheet(isPresented:$playlistEditor) { playlistSheet }
.alert("DJ workstation",isPresented:Binding(get:{system.error != nil},set:{if !$0 { system.error = nil }})) { Button("OK") { system.error = nil } } message: { Text(system.error ?? "") }
.onAppear { refreshPlaylist();connectMIDI() }
@@ -757,9 +747,6 @@ struct DJConsole: View {
Text("TWO DECKS").font(.system(size:9,weight:.medium)).foregroundStyle(.secondary)
Spacer()
if system.previewDeck != nil { Button("Stop headphone preview") { system.stopPreview() }.tint(.green) }
Button { settingsModal = true } label: { Label("DJ Settings",systemImage:"gearshape") }
Button { routing = true } label: { Label("Audio Routing",systemImage:"hifispeaker.fill") }
Button { mapping = true } label: { Label("MIDI",systemImage:"pianokeys") }
}.controlSize(.small)
}
private var browser: some View {