Talon
6ab78fa792
Mirrors the Windows client's UI overhaul (commit97fa659+540ec13) adapted to Mac-native conventions. The main window is now just toolbar + channels + users + chat; audio device settings moved to a modeless Settings window. - NSToolbar: Join Voice, Share Screen Audio, Mute, Deafen (SF Symbol toggle buttons) + Output Volume slider (NSSlider 0-100, default 80). Voice actions, mute/deafen, and output volume moved out of the bottom panel into the toolbar - Audio device settings (input mode, VAD sensitivity, PTT key, device picker, level meter) moved to a new SettingsWindowController -- a modeless window opened via the app menu's "Settings..." (Cmd+,) item. Source-of-truth for audio state lives in MainWindowController so voice start applies settings even before the window has been opened; SettingsWindowController reads from / writes back to those properties and applies changes live when voice is active. Level meter forwarded from handleLevel -> updateLevel(rms:) - Unified log: chat NSTextView + activity NSTableView collapsed into a single NSTextView -- activity events in secondaryLabelColor (gray), chat in default - Private messaging: scope dropdown removed; compose always sends to the current channel. Each PM conversation opens in its own modeless PrivateMessageWindowController. Incoming .textMessage with .private scope routed to the right window; outgoing PMs echoed by server arrive through the same path. "Send Private Message..." added to user context menu. - Messages menu: "New Private Message..." (Cmd+Shift+N) opens a UserPickerSheet listing all server users so you can PM anyone on the server - Channel tree now shows live user counts, e.g. "General (3)"; refreshChannelTree called on .userJoined/.userLeft (was missing) - Voice menu: Join Voice (Cmd+Shift+V), Share Screen Audio (Cmd+Shift+S), Mute (Cmd+Shift+M), Deafen (Cmd+Shift+D) -- NSMenuItem key equivalents with [.command, .shift] mask, dispatched by the responder chain - setOutputVolume(_:) wrapper added to VoiceCatClient.swift (was missing -- the C ABI + C# wrapper shipped in commit97fa659but the Swift wrapper was never added); wired end-to-end: toolbar slider -> client.setOutputVolume(gain) Part A -- fixed and verified the previously-uncompiled Swift from the external PCM feed/tap commit (615d2a8): - Rebuilt the macOS xcframework slice (regenerated the module map from current voicecat.h, exposing vc_pcm_sink_cb / vc_stream_feed_pcm / vc_set_pcm_sink) - Fixed feedPcm type bug: size_t imports as Int in Swift not UInt; the original UInt(samplesPerChannel) was wrong - Added VoiceCatPcmSinkCallback typealias -- a Swift-idiomatic public alias for the C vc_pcm_sink_cb so consumers (tests, the macOS app) can declare a sink callback without directly importing the VoiceCatC C module. Mirrors the C# VcPcmSinkCallback delegate - keyCodeName helper deduplicated (was in PttKeyCaptureSheet.swift + MainWindowController.swift -- now shared) Platform-specific adaptations (vs. Windows): NSToolbar instead of ToolStrip; global menu bar + NSMenuItem key equivalents (Cmd not Ctrl, responder-chain dispatched, no custom key monitor needed); PM windows as modeless NSWindows; picker as Mac sheet; gray = secondaryLabelColor; SF Symbols for toolbar icons. swift test 10/10 (4 ExternalPcmTests + 6 VoiceCatClientSmokeTests against a live server); xcodebuild Debug + Release BUILD SUCCEEDED with 0 Swift warnings.
69 lines
2.8 KiB
Swift
69 lines
2.8 KiB
Swift
// ExternalPcmTests — Swift wrapper smoke tests for vc_stream_feed_pcm / vc_set_pcm_sink.
|
|
//
|
|
// These tests verify that the Swift API surface compiles, is callable, and returns expected
|
|
// results at the C-ABI boundary — without requiring a live server or audio hardware.
|
|
// Full end-to-end relay / decode verification is covered by tests/test_external_pcm.cpp
|
|
// (C++ ctest), which runs headlessly on all platforms.
|
|
|
|
import XCTest
|
|
@testable import VoiceCatCore
|
|
|
|
final class ExternalPcmTests: XCTestCase {
|
|
|
|
// MARK: - feedPcm: API surface smoke
|
|
|
|
/// Calling feedPcm without a connected client or active stream must return .invalidArg
|
|
/// (not crash). Proves the Swift→C bridge compiles and handles the error path.
|
|
func testFeedPcm_noActiveStream_returnsInvalidArg() {
|
|
let client = VoiceCatClient(config: VoiceCatConfig(
|
|
clientName: "ext-pcm-test",
|
|
clientVersion: "0.1",
|
|
logLevel: .off
|
|
))
|
|
let sine = [Int16](repeating: 0, count: 960)
|
|
// Stream 0 doesn't exist — the core must return invalidArg, not crash.
|
|
let result = client.feedPcm(streamId: 0, pcm: sine, samplesPerChannel: 960, channels: 1)
|
|
XCTAssertEqual(result, .invalidArg)
|
|
}
|
|
|
|
/// Calling feedPcm with channels=3 (invalid) must return .invalidArg.
|
|
func testFeedPcm_invalidChannels_returnsInvalidArg() {
|
|
let client = VoiceCatClient(config: VoiceCatConfig(
|
|
clientName: "ext-pcm-test",
|
|
clientVersion: "0.1",
|
|
logLevel: .off
|
|
))
|
|
let pcm = [Int16](repeating: 0, count: 960 * 3)
|
|
let result = client.feedPcm(streamId: 0, pcm: pcm, samplesPerChannel: 960, channels: 3)
|
|
XCTAssertEqual(result, .invalidArg)
|
|
}
|
|
|
|
// MARK: - setPcmSink: API surface smoke
|
|
|
|
/// setPcmSink(nil) on a freshly-created client must succeed (nil = disable, which is the
|
|
/// default state — a no-op that must still return .ok).
|
|
func testSetPcmSink_nil_returnsOk() {
|
|
let client = VoiceCatClient(config: VoiceCatConfig(
|
|
clientName: "ext-pcm-test",
|
|
clientVersion: "0.1",
|
|
logLevel: .off
|
|
))
|
|
let result = client.setPcmSink(nil, user: nil)
|
|
XCTAssertEqual(result, .ok)
|
|
}
|
|
|
|
/// Calling setPcmSink with a @convention(c) function and then immediately disabling it
|
|
/// with nil must both succeed. Verifies the C-ABI function-pointer round-trip.
|
|
func testSetPcmSink_enableThenDisable_bothSucceed() {
|
|
let client = VoiceCatClient(config: VoiceCatConfig(
|
|
clientName: "ext-pcm-test",
|
|
clientVersion: "0.1",
|
|
logLevel: .off
|
|
))
|
|
|
|
let mySink: VoiceCatPcmSinkCallback = { _, _, _, _, _, _, _ in }
|
|
XCTAssertEqual(client.setPcmSink(mySink, user: nil), .ok)
|
|
XCTAssertEqual(client.setPcmSink(nil, user: nil), .ok)
|
|
}
|
|
}
|