feat(clients): expose all channel codec params + guest nickname everywhere
Channel create/edit UIs only surfaced a subset of the core's vc_audio_config, and DRED was exposed nowhere. While adding it, found a latent ABI mismatch: both Swift AudioConfig and the C# VcAudioConfigNative blittable struct were one int short of the native vc_audio_config (missing the trailing `dred`), so native read past the managed struct in vc_create_channel/vc_edit_channel. - core marshaling: thread `dred` through Swift (Models/Marshaling/toNative) and C# (Structs/Models/Marshaling/VoiceCatClient) -- fixes the ABI gap + enables it - windows: add the one missing DRED checkbox to ChannelEditDialog - macos: ChannelEditSheet now exposes application, sample rate, packet loss, complexity, and DRED (was stereo/bitrate/frame/FEC/DTX only) - ios: rebuild ChannelEditView into a full create+edit form (all params); add SessionState.editChannel + an admin Edit swipe action (iOS had no edit UI) - guest nickname: add a dedicated `nickname` to SavedServer on macOS+iOS (backward-compatible Codable), shown in Guest mode, wired into the guest auth path -- guests could not set a display name on either before (only Windows) Verified: macOS + iOS (sim, arm64) xcodebuild BUILD SUCCEEDED; core ctest 22/23 (only external_pcm aborts on a pre-existing shutdown mutex race; no C++ changed).
This commit is contained in:
@@ -25,7 +25,18 @@ final class ChannelEditSheet: NSViewController {
|
||||
}()
|
||||
private let fecCheckbox = NSButton(checkboxWithTitle: "FEC", target: nil, action: nil)
|
||||
private let dtxCheckbox = NSButton(checkboxWithTitle: "DTX", target: nil, action: nil)
|
||||
private let dredCheckbox = NSButton(checkboxWithTitle: "DRED", target: nil, action: nil)
|
||||
private let frameMsPicker = NSPopUpButton()
|
||||
private let applicationPicker = NSPopUpButton()
|
||||
private let sampleRateField: NSTextField = {
|
||||
let f = NSTextField(); f.stringValue = "48000"; return f
|
||||
}()
|
||||
private let packetLossField: NSTextField = {
|
||||
let f = NSTextField(); f.stringValue = "5"; return f
|
||||
}()
|
||||
private let complexityField: NSTextField = {
|
||||
let f = NSTextField(); f.stringValue = "10"; return f
|
||||
}()
|
||||
|
||||
init(channels: [Channel], editing: ChannelEdit?) {
|
||||
self.channels = channels
|
||||
@@ -72,14 +83,24 @@ final class ChannelEditSheet: NSViewController {
|
||||
maxUsersField.setAccessibilityLabel("Max users (0 = unlimited)")
|
||||
sortOrderField.setAccessibilityLabel("Sort order")
|
||||
|
||||
for ms in ["20", "40", "60"] { frameMsPicker.addItem(withTitle: "\(ms) ms") }
|
||||
for ms in ["10", "20", "40", "60"] { frameMsPicker.addItem(withTitle: "\(ms) ms") }
|
||||
frameMsPicker.selectItem(withTitle: "20 ms")
|
||||
frameMsPicker.setAccessibilityLabel("Opus frame duration")
|
||||
|
||||
applicationPicker.addItem(withTitle: "VoIP")
|
||||
applicationPicker.addItem(withTitle: "Audio")
|
||||
applicationPicker.addItem(withTitle: "Low delay")
|
||||
applicationPicker.setAccessibilityLabel("Opus application profile")
|
||||
|
||||
fecCheckbox.state = .on
|
||||
stereoCheckbox.setAccessibilityLabel("Stereo audio")
|
||||
bitrateField.setAccessibilityLabel("Bitrate in bits per second")
|
||||
sampleRateField.setAccessibilityLabel("Sample rate in Hz")
|
||||
packetLossField.setAccessibilityLabel("Expected packet loss percent (0 to 100)")
|
||||
complexityField.setAccessibilityLabel("Opus complexity (0 to 10)")
|
||||
fecCheckbox.setAccessibilityLabel("Forward error correction")
|
||||
dtxCheckbox.setAccessibilityLabel("Discontinuous transmission")
|
||||
dredCheckbox.setAccessibilityLabel("Deep redundancy (DRED)")
|
||||
|
||||
let generalGrid = NSGridView(views: [
|
||||
[NSTextField(labelWithString: "Name:"), nameField],
|
||||
@@ -94,9 +115,13 @@ final class ChannelEditSheet: NSViewController {
|
||||
|
||||
let audioGrid = NSGridView(views: [
|
||||
[NSTextField(labelWithString: "Bitrate:"), bitrateField],
|
||||
[NSTextField(labelWithString: "Sample rate:"), sampleRateField],
|
||||
[NSTextField(labelWithString: "Frame:"), frameMsPicker],
|
||||
[NSTextField(labelWithString: "Application:"), applicationPicker],
|
||||
[NSTextField(labelWithString: "Packet loss %:"), packetLossField],
|
||||
[NSTextField(labelWithString: "Complexity:"), complexityField],
|
||||
[stereoCheckbox, fecCheckbox],
|
||||
[dtxCheckbox, NSView()],
|
||||
[dtxCheckbox, dredCheckbox],
|
||||
])
|
||||
audioGrid.rowSpacing = 8; audioGrid.columnSpacing = 8
|
||||
audioGrid.column(at: 0).xPlacement = .trailing
|
||||
@@ -149,8 +174,13 @@ final class ChannelEditSheet: NSViewController {
|
||||
sortOrderField.stringValue = "\(e.sortOrder)"
|
||||
stereoCheckbox.state = e.audio.stereo ? .on : .off
|
||||
bitrateField.stringValue = "\(e.audio.bitrateBps)"
|
||||
sampleRateField.stringValue = "\(e.audio.sampleRate)"
|
||||
packetLossField.stringValue = "\(e.audio.expectedPacketLoss)"
|
||||
complexityField.stringValue = "\(e.audio.complexity)"
|
||||
fecCheckbox.state = e.audio.fec ? .on : .off
|
||||
dtxCheckbox.state = e.audio.dtx ? .on : .off
|
||||
dredCheckbox.state = e.audio.dred ? .on : .off
|
||||
applicationPicker.selectItem(at: Int(min(e.audio.application, 2)))
|
||||
let frameStr = "\(e.audio.frameMs) ms"
|
||||
if let item = frameMsPicker.item(withTitle: frameStr) { frameMsPicker.select(item) }
|
||||
}
|
||||
@@ -167,15 +197,24 @@ final class ChannelEditSheet: NSViewController {
|
||||
let maxUsers = UInt32(maxUsersField.stringValue) ?? 0
|
||||
let sortOrder = UInt32(sortOrderField.stringValue) ?? 0
|
||||
let bitrate = UInt32(bitrateField.stringValue) ?? 64000
|
||||
let sampleRate = UInt32(sampleRateField.stringValue) ?? 48000
|
||||
let packetLoss = min(UInt32(packetLossField.stringValue) ?? 5, 100)
|
||||
let complexity = min(UInt32(complexityField.stringValue) ?? 10, 10)
|
||||
let frameMsStr = frameMsPicker.titleOfSelectedItem?.replacingOccurrences(of: " ms", with: "") ?? "20"
|
||||
let frameMs = UInt32(frameMsStr) ?? 20
|
||||
let application = UInt32(max(applicationPicker.indexOfSelectedItem, 0))
|
||||
|
||||
let audio = AudioConfig(
|
||||
stereo: stereoCheckbox.state == .on,
|
||||
sampleRate: sampleRate,
|
||||
bitrateBps: bitrate,
|
||||
frameMs: frameMs,
|
||||
application: application,
|
||||
fec: fecCheckbox.state == .on,
|
||||
dtx: dtxCheckbox.state == .on
|
||||
expectedPacketLoss: packetLoss,
|
||||
dtx: dtxCheckbox.state == .on,
|
||||
complexity: complexity,
|
||||
dred: dredCheckbox.state == .on
|
||||
)
|
||||
let pwProtected = pwCheckbox.state == .on
|
||||
let pw: String? = pwProtected ? (pwField.stringValue.isEmpty ? nil : pwField.stringValue) : nil
|
||||
|
||||
Reference in New Issue
Block a user