macos: Support multi window browsing This enables opening multiple zones in a dedicated windows at the same time. I don't use multiple zones, though.

Changes

2 changed files (+20/-5)

• macos/RoonKit/Sources/RoonKit/Services/BrowseService.swift
  • @@ -200,6 +200,7 @@ }
    public struct BrowseRequest: Codable { public let hierarchy: Hierarchy + public let multiSessionKey: String? public let itemKey: String? public let input: String? public let zoneOrOutputID: String?
  • @@ -209,6 +210,7 @@ public let refreshList: Bool?
    public enum CodingKeys: String, CodingKey { case hierarchy = "hierarchy" + case multiSessionKey = "multi_session_key" case itemKey = "item_key" case input = "input" case zoneOrOutputID = "zone_or_output_id"
  • @@ -219,6 +221,7 @@ }
    public init( hierarchy: Hierarchy, + multiSessionKey: String? = nil, itemKey: String? = nil, input: String? = nil, zoneOrOutputID: String? = nil,
  • @@ -227,6 +230,7 @@ popLevels: UInt? = nil,
    refreshList: Bool? = nil ) { self.hierarchy = hierarchy + self.multiSessionKey = multiSessionKey self.itemKey = itemKey self.input = input self.zoneOrOutputID = zoneOrOutputID
  • @@ -285,35 +289,35 @@
    extension BrowseService { public struct LoadRequest: Codable { public let hierarchy: Hierarchy + public let multiSessionKey: String? public let displayOffset: Int? public let level: UInt? public let offset: Int? public let count: UInt? - public let multiSessionKey: String? public enum CodingKeys: String, CodingKey { case hierarchy = "hierarchy" + case multiSessionKey = "multi_session_key" case displayOffset = "display_offset" case level = "level" case offset = "offset" case count = "count" - case multiSessionKey = "multi_session_key" } public init( hierarchy: Hierarchy, + multiSessionKey: String? = nil, displayOffset: Int? = nil, level: UInt? = 0, offset: Int? = 0, count: UInt? = nil, - multiSessionKey: String? = nil ) { self.hierarchy = hierarchy + self.multiSessionKey = multiSessionKey self.displayOffset = displayOffset self.level = level self.offset = offset self.count = count - self.multiSessionKey = multiSessionKey } }
• macos/plac/DataModels/BrowsingDataModel.swift
  • @@ -97,6 +97,8 @@
    @ObservationIgnored private var loading: Task<Void, Never>? = nil + private let id: UUID = .init() + var hierarchy: BrowseService.Hierarchy? = nil { didSet { stack = []
  • @@ -167,6 +169,7 @@ try await conn.request(
    Moo( browse: .init( hierarchy: hierarchy, + multiSessionKey: id.uuidString, zoneOrOutputID: zone?.id, popAll: true )
  • @@ -187,7 +190,11 @@
    let load = try BrowseService.LoadResponse( try await conn.request( Moo( - load: .init(hierarchy: hierarchy, count: UInt(UInt16.max)) + load: .init( + hierarchy: hierarchy, + multiSessionKey: id.uuidString, + count: UInt(UInt16.max), + ) ) ) )
  • @@ -231,6 +238,7 @@ try await conn.request(
    Moo( browse: .init( hierarchy: hierarchy, + multiSessionKey: id.uuidString, zoneOrOutputID: zone?.id, popLevels: UInt(level) )
  • @@ -258,6 +266,7 @@ try await conn.request(
    Moo( load: .init( hierarchy: hierarchy, + multiSessionKey: id.uuidString, level: list.level, count: UInt(UInt16.max) )
  • @@ -313,6 +322,7 @@ try await conn.request(
    Moo( browse: .init( hierarchy: hierarchy, + multiSessionKey: id.uuidString, itemKey: item.itemKey, zoneOrOutputID: zone?.id )
  • @@ -373,6 +383,7 @@ try await conn.request(
    Moo( load: .init( hierarchy: hierarchy, + multiSessionKey: id.uuidString, level: list.level, count: UInt(UInt16.max) )