Convert reaction sounds to call view model / rxjs

src/room/InCallView.tsx

@@ -642,7 +642,7 @@ export const InCallView: FC<InCallViewProps> = ({
       <RoomAudioRenderer />
       {renderContent()}
       <CallEventAudioRenderer vm={vm} />
-      <ReactionsAudioRenderer />
+      <ReactionsAudioRenderer vm={vm} />
       <ReactionsOverlay vm={vm} />
       {footer}
       {layout.type !== "pip" && (

src/room/ReactionAudioRenderer.tsx

@@ -13,6 +13,7 @@ import { GenericReaction, ReactionSet } from "../reactions";
 import { useAudioContext } from "../useAudioContext";
 import { prefetchSounds } from "../soundUtils";
 import { useLatest } from "../useLatest";
+import { CallViewModel } from "../state/CallViewModel";
 
 const soundMap = Object.fromEntries([
   ...ReactionSet.filter((v) => v.sound !== undefined).map((v) => [
@@ -22,8 +23,11 @@ const soundMap = Object.fromEntries([
   [GenericReaction.name, GenericReaction.sound],
 ]);
 
-export function ReactionsAudioRenderer(): ReactNode {
+export function ReactionsAudioRenderer({
-  const { reactions } = useReactions();
+  vm,
+}: {
+  vm: CallViewModel;
+}): ReactNode {
   const [shouldPlay] = useSetting(playReactionsSound);
   const [soundCache, setSoundCache] = useState<ReturnType<
     typeof prefetchSounds
@@ -33,7 +37,6 @@ export function ReactionsAudioRenderer(): ReactNode {
     latencyHint: "interactive",
   });
   const audioEngineRef = useLatest(audioEngineCtx);
-  const oldReactions = useDeferredValue(reactions);
 
   useEffect(() => {
     if (!shouldPlay || soundCache) {
@@ -46,26 +49,19 @@ export function ReactionsAudioRenderer(): ReactNode {
   }, [soundCache, shouldPlay]);
 
   useEffect(() => {
-    if (!shouldPlay || !audioEngineRef.current) {
+    const sub = vm.audibleReactions.subscribe((newReactions) => {
-      return;
+      for (const reactionName of newReactions) {
-    }
+        if (soundMap[reactionName]) {
-    const oldReactionSet = new Set(
+          audioEngineRef.current?.playSound(reactionName);
-      Object.values(oldReactions).map((r) => r.name),
+        } else {
-    );
+          // Fallback sounds.
-    for (const reactionName of new Set(
+          audioEngineRef.current?.playSound("generic");
-      Object.values(reactions).map((r) => r.name),
+        }
-    )) {
-      if (oldReactionSet.has(reactionName)) {
-        // Don't replay old reactions
-        return;
       }
-      if (soundMap[reactionName]) {
+    });
-        audioEngineRef.current.playSound(reactionName);
+    return (): void => {
-      } else {
+      sub.unsubscribe();
-        // Fallback sounds.
+    };
-        audioEngineRef.current.playSound("generic");
+  }, [vm, audioEngineRef]);
-      }
-    }
-  }, [audioEngineRef, shouldPlay, oldReactions, reactions]);
   return null;
 }

src/state/CallViewModel.ts

@@ -26,6 +26,7 @@ import {
   Subject,
   combineLatest,
   concat,
+  distinct,
   distinctUntilChanged,
   filter,
   forkJoin,
@@ -66,7 +67,11 @@ import {
 } from "./MediaViewModel";
 import { accumulate, finalizeValue } from "../utils/observable";
 import { ObservableScope } from "./ObservableScope";
-import { duplicateTiles, showReactions } from "../settings/settings";
+import {
+  duplicateTiles,
+  playReactionsSound,
+  showReactions,
+} from "../settings/settings";
 import { isFirefox } from "../Platform";
 import { setPipEnabled } from "../controls";
 import { GridTileViewModel, SpotlightTileViewModel } from "./TileViewModel";
@@ -1101,12 +1106,9 @@ export class CallViewModel extends ViewModel {
     this.reactions.next(data.reactions);
   }
 
-  public readonly visibleReactions = combineLatest([
+  public readonly visibleReactions = showReactions.value
-    this.reactions,
+    .pipe(switchMap((show) => (show ? this.reactions : of({}))))
-    showReactions.value,
-  ])
     .pipe(
-      map(([reactions, setting]) => (setting ? reactions : {})),
       scan<
         Record<string, ReactionOption>,
         { sender: string; emoji: string; startX: number }[]
@@ -1123,6 +1125,32 @@ export class CallViewModel extends ViewModel {
     )
     .pipe(this.scope.state());
 
+  public readonly audibleReactions = playReactionsSound.value
+    .pipe(
+      switchMap((show) =>
+        show ? this.reactions : of<Record<string, ReactionOption>>({}),
+      ),
+    )
+    .pipe(
+      map((reactions) => Object.values(reactions).map((v) => v.name)),
+      scan<string[], { playing: string[]; newSounds: string[] }>(
+        (acc, latest) => {
+          return {
+            playing: latest.filter(
+              (v) => acc.playing.includes(v) || acc.newSounds.includes(v),
+            ),
+            newSounds: latest.filter(
+              (v) => !acc.playing.includes(v) && !acc.newSounds.includes(v),
+            ),
+          };
+        },
+        { playing: [], newSounds: [] },
+      ),
+      map((v) => v.newSounds),
+      distinct(),
+    )
+    .pipe(this.scope.state());
+
   public constructor(
     // A call is permanently tied to a single Matrix room and LiveKit room
     private readonly matrixRTCSession: MatrixRTCSession,