use the matrixRtcSdk

src/state/media/RemoteScreenShareViewModel.ts

@@ -6,18 +6,20 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { Track, type RemoteParticipant } from "livekit-client";
-import { map, of, switchMap } from "rxjs";
+import {
+  type AudioMediaTrack,
+  type Behavior,
+  type ObservableScope,
+} from "@element-hq/matrixrtc-sdk";
+import { map } from "rxjs";
 
-import { type Behavior } from "../Behavior";
 import {
   type BaseScreenShareInputs,
   type BaseScreenShareViewModel,
   createBaseScreenShare,
 } from "./ScreenShareViewModel";
-import { type ObservableScope } from "../ObservableScope";
 import { createVolumeControls, type VolumeControls } from "../VolumeControls";
-import { observeTrackReference$ } from "../observeTrackReference";
+import { memberTrack$ } from "./MemberMediaViewModel";
 
 export interface RemoteScreenShareViewModel
   extends BaseScreenShareViewModel, VolumeControls {
@@ -33,7 +35,6 @@ export interface RemoteScreenShareViewModel
 }
 
 export interface RemoteScreenShareInputs extends BaseScreenShareInputs {
-  participant$: Behavior<RemoteParticipant | null>;
   pretendToBeDisconnected$: Behavior<boolean>;
 }
 
@@ -41,16 +42,16 @@ export function createRemoteScreenShare(
   scope: ObservableScope,
   { pretendToBeDisconnected$, ...inputs }: RemoteScreenShareInputs,
 ): RemoteScreenShareViewModel {
+  const audio$ = scope.behavior(
+    memberTrack$<AudioMediaTrack>(inputs.media$, "screenShareAudio"),
+  );
   return {
     ...createBaseScreenShare(scope, inputs),
     ...createVolumeControls(scope, {
       pretendToBeDisconnected$,
       sink$: scope.behavior(
-        inputs.participant$.pipe(
-          map(
-            (p) => (volume) =>
-              p?.setVolume(volume, Track.Source.ScreenShareAudio),
-          ),
+        audio$.pipe(
+          map((track) => (volume: number) => track?.setVolume(volume)),
         ),
       ),
     }),
@@ -59,14 +60,7 @@ export function createRemoteScreenShare(
       pretendToBeDisconnected$.pipe(map((disconnected) => !disconnected)),
     ),
     audioEnabled$: scope.behavior(
-      inputs.participant$.pipe(
-        switchMap((p) =>
-          p
-            ? observeTrackReference$(p, Track.Source.ScreenShareAudio)
-            : of(null),
-        ),
-        map(Boolean),
-      ),
+      audio$.pipe(map((track) => track !== undefined)),
     ),
   };
 }