diff --git a/src/livekit/useECConnectionState.test.tsx b/src/livekit/useECConnectionState.test.tsx index 5f2f6064..2118e4ff 100644 --- a/src/livekit/useECConnectionState.test.tsx +++ b/src/livekit/useECConnectionState.test.tsx @@ -57,7 +57,7 @@ test.each<[string, ConnectionError]>([ () => setSfuConfig({ url: "URL", jwt: "JWT token" }), [], ); - useECConnectionState({}, false, mockRoom, sfuConfig); + useECConnectionState("default", false, mockRoom, sfuConfig); return ; }; diff --git a/src/livekit/useECConnectionState.ts b/src/livekit/useECConnectionState.ts index 90eda057..d877dde7 100644 --- a/src/livekit/useECConnectionState.ts +++ b/src/livekit/useECConnectionState.ts @@ -59,7 +59,7 @@ async function doConnect( livekitRoom: Room, sfuConfig: SFUConfig, audioEnabled: boolean, - audioOptions: AudioCaptureOptions, + initialDeviceId: string | undefined, ): Promise { // Always create an audio track manually. // livekit (by default) keeps the mic track open when you mute, but if you start muted, @@ -82,7 +82,7 @@ async function doConnect( let preCreatedAudioTrack: LocalTrack | undefined; try { const audioTracks = await livekitRoom!.localParticipant.createTracks({ - audio: audioOptions, + audio: { deviceId: initialDeviceId }, }); if (audioTracks.length < 1) { logger.info("Tried to pre-create local audio track but got no tracks"); @@ -187,7 +187,7 @@ async function connectAndPublish( } export function useECConnectionState( - initialAudioOptions: AudioCaptureOptions, + initialDeviceId: string | undefined, initialAudioEnabled: boolean, livekitRoom?: Room, sfuConfig?: SFUConfig, @@ -280,7 +280,7 @@ export function useECConnectionState( livekitRoom!, sfuConfig!, initialAudioEnabled, - initialAudioOptions, + initialDeviceId, ) .catch((e) => { if (e instanceof ElementCallError) { @@ -296,7 +296,7 @@ export function useECConnectionState( }, [ sfuConfig, livekitRoom, - initialAudioOptions, + initialDeviceId, initialAudioEnabled, doFocusSwitch, ]); diff --git a/src/livekit/useLiveKit.ts b/src/livekit/useLiveKit.ts index 99eda021..972f7756 100644 --- a/src/livekit/useLiveKit.ts +++ b/src/livekit/useLiveKit.ts @@ -155,9 +155,7 @@ export function useLiveKit( ); const connectionState = useECConnectionState( - { - deviceId: initialDevices.current.audioInput.selectedId, - }, + initialDevices.current.audioInput.selectedId, initialMuteStates.current.audio.enabled, room, sfuConfig,