broken changes
This commit is contained in:
@@ -65,9 +65,7 @@ struct SongDragReference: Codable, Sendable {
|
||||
@Published var activeSection = "Library"
|
||||
@Published var studio = StudioSettings() { didSet { applyStudioSettings(save:true,previous:oldValue) } }
|
||||
let backgroundDeck = BackgroundDeck()
|
||||
#if KJMIX_DJ_CONSOLE
|
||||
let dj = DJSystem()
|
||||
#endif
|
||||
let dj: DJSystem
|
||||
var backgroundAutomationReady = false
|
||||
var backgroundPlaybackObserver: AnyCancellable?
|
||||
var backgroundHandoff: Task<Void,Never>?
|
||||
@@ -123,6 +121,7 @@ struct SongDragReference: Codable, Sendable {
|
||||
var currentVenueName: String { venues.first { $0.id == currentVenue }?.name ?? "No venue selected" }
|
||||
init(storageURL: URL? = nil) {
|
||||
root = storageURL ?? FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0].appendingPathComponent("KJamsClone")
|
||||
dj = DJSystem(storageURL:root.appendingPathComponent("DJ"))
|
||||
managedMediaDirectory = root.appendingPathComponent("Media")
|
||||
player = Player(waveformCacheDirectory:root.appendingPathComponent("Waveforms"))
|
||||
perform {
|
||||
@@ -673,6 +672,8 @@ private struct TransportButton: View {
|
||||
}
|
||||
struct LibraryView: View {
|
||||
@ObservedObject var model: AppModel
|
||||
@State var showDJ = true
|
||||
@State private var djSongSettings = false
|
||||
@State private var selected: Int64?
|
||||
@State private var tableSelection = Set<Int64>()
|
||||
@State private var waveformDetails = false
|
||||
@@ -723,9 +724,11 @@ struct LibraryView: View {
|
||||
HSplitView {
|
||||
sidebar.frame(minWidth:220,idealWidth:240,maxWidth:260)
|
||||
VStack(spacing:0) {
|
||||
BackgroundDeckStrip(model:model,deck:model.backgroundDeck).padding(.horizontal,16).padding(.vertical,6)
|
||||
Divider()
|
||||
TransportView(player:model.player,model:model,search:$search,hasSelection:selectedSong != nil,
|
||||
play:playSelected,next:playNext,display:{ openWindow(id:"lyrics") })
|
||||
.padding(20)
|
||||
.padding(showDJ ? 12 : 20)
|
||||
Divider()
|
||||
HStack {
|
||||
VStack(alignment:.leading,spacing:4) {
|
||||
@@ -733,10 +736,14 @@ struct LibraryView: View {
|
||||
Text(source == "Library" ? "\(model.songs.count) songs in your collection" : model.currentVenueName).font(.callout).foregroundStyle(.secondary)
|
||||
}
|
||||
Spacer()
|
||||
if showDJ,["Library","Singer Songs","Playlists"].contains(source) {
|
||||
Button("Song Settings") { djSongSettings = true }
|
||||
.popover(isPresented:$djSongSettings) { detailPanel.frame(width:900,height:135).padding(12) }
|
||||
}
|
||||
if source == "Library" {
|
||||
Button { importing = true } label: { Label("Import Music",systemImage:"plus") }.buttonStyle(.bordered)
|
||||
}
|
||||
}.padding(.horizontal,22).padding(.vertical,18)
|
||||
}.padding(.horizontal,22).padding(.vertical,showDJ ? 8 : 18)
|
||||
sourceContent.frame(maxWidth:.infinity,maxHeight:.infinity)
|
||||
if let progress = model.waveformJob {
|
||||
HStack(spacing:10) {
|
||||
@@ -748,23 +755,19 @@ struct LibraryView: View {
|
||||
}.padding(.horizontal,18).padding(.vertical,8)
|
||||
}
|
||||
Divider()
|
||||
if ["Library","Singer Songs","Playlists"].contains(source) { detailPanel.frame(height:135) }
|
||||
Divider()
|
||||
BackgroundDeckStrip(model:model,deck:model.backgroundDeck).padding(.horizontal,16).padding(.vertical,8)
|
||||
if !showDJ,["Library","Singer Songs","Playlists"].contains(source) { detailPanel.frame(height:135) }
|
||||
Divider()
|
||||
footer.padding(.horizontal,18).padding(.vertical,8)
|
||||
}.frame(minWidth:780)
|
||||
}
|
||||
}
|
||||
@ViewBuilder private var workspaceLayout: some View {
|
||||
#if KJMIX_DJ_CONSOLE
|
||||
VSplitView {
|
||||
libraryWorkspace.frame(minHeight:400)
|
||||
DJConsole(model:model,system:model.dj).frame(minHeight:400,idealHeight:470)
|
||||
}
|
||||
#else
|
||||
libraryWorkspace
|
||||
#endif
|
||||
if showDJ {
|
||||
VSplitView {
|
||||
libraryWorkspace.frame(minHeight:400)
|
||||
DJConsole(model:model,system:model.dj).frame(minHeight:440,idealHeight:510)
|
||||
}
|
||||
} else { libraryWorkspace }
|
||||
}
|
||||
private var workspace: some View {
|
||||
workspaceLayout
|
||||
@@ -777,6 +780,7 @@ struct LibraryView: View {
|
||||
.searchable(text:$search,placement:.toolbar,prompt:"Search Music")
|
||||
.toolbar {
|
||||
ToolbarItemGroup {
|
||||
Button { showDJ.toggle() } label: { Label(showDJ ? "Hide DJ" : "Show DJ",systemImage:"waveform.path") }.help("Show or hide the DJ workspace; playback continues")
|
||||
Menu {
|
||||
Button("Import Files or Folder…") { importing = true }
|
||||
Button("Import from SMB/NAS…") { importingServer = true }
|
||||
|
||||
Reference in New Issue
Block a user