make audio work

Signed-off-by: Timo K <toger5@hotmail.de>

src/room/InCallView.test.tsx

@@ -45,7 +45,7 @@ import {
 } from "../settings/settings";
 import { ReactionsSenderProvider } from "../reactions/useReactionsSender";
 import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";
-import { MatrixAudioRenderer } from "../livekit/MatrixAudioRenderer";
+import { LivekitRoomAudioRenderer } from "../livekit/MatrixAudioRenderer";
 import { MediaDevicesContext } from "../MediaDevicesContext";
 import { HeaderStyle } from "../UrlParams";
 
@@ -88,7 +88,7 @@ beforeEach(() => {
 
   // MatrixAudioRenderer is tested separately.
   (
-    MatrixAudioRenderer as MockedFunction<typeof MatrixAudioRenderer>
+    LivekitRoomAudioRenderer as MockedFunction<typeof LivekitRoomAudioRenderer>
   ).mockImplementation((_props) => {
     return <div>mocked: MatrixAudioRenderer</div>;
   });

src/room/InCallView.tsx

@@ -106,6 +106,7 @@ import {
 } from "../settings/settings";
 import { ReactionsReader } from "../reactions/ReactionsReader";
 import { useTypedEventEmitter } from "../useEvents.ts";
+import { LivekitRoomAudioRenderer } from "../livekit/MatrixAudioRenderer.tsx";
 import { muteAllAudio$ } from "../state/MuteAllAudioModel.ts";
 import { useMediaDevices } from "../MediaDevicesContext.ts";
 import { EarpieceOverlay } from "./EarpieceOverlay.tsx";
@@ -151,7 +152,6 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
       },
       reactionsReader.raisedHands$,
       reactionsReader.reactions$,
-      props.e2eeSystem,
     );
     setVm(vm);
     return (): void => {
@@ -746,6 +746,8 @@ export const InCallView: FC<InCallViewProps> = ({
     matrixRoom.roomId,
   );
 
+  const allLivekitRooms = useBehavior(vm.allLivekitRooms$);
+  const memberships = useBehavior(vm.memberships$);
   const toggleScreensharing = useCallback(() => {
     throw new Error("TODO-MULTI-SFU");
     // localParticipant
@@ -878,7 +880,14 @@ export const InCallView: FC<InCallViewProps> = ({
           </Text>
         )
       }
-      {/* TODO-MULTI-SFU: <MatrixAudioRenderer members={memberships} muted={muteAllAudio} /> */}
+      {allLivekitRooms.map((roomItem) => (
+        <LivekitRoomAudioRenderer
+          key={roomItem.url}
+          livekitRoom={roomItem.room}
+          members={memberships}
+          muted={muteAllAudio}
+        />
+      ))}
       {renderContent()}
       <CallEventAudioRenderer vm={vm} muted={muteAllAudio} />
       <ReactionsAudioRenderer vm={vm} muted={muteAllAudio} />