From cc994abeb366142cde829e79e6539875c2fa103f Mon Sep 17 00:00:00 2001 From: "Timo K." Date: Thu, 5 Nov 2026 10:37:14 +0100 Subject: [PATCH] review duplicated BackgoundEffects files One is now called backgroundEffectCatalog --- src/components/CallFooterViewModel.tsx | 2 +- src/settings/SettingsModal.tsx | 5 ++++- src/settings/settings.ts | 2 +- src/state/BackgroundEffects.test.ts | 2 +- src/state/BackgroundEffects.ts | 5 +++-- ...groundEffects.test.ts => backgroundEffectCatalog.test.ts} | 2 +- .../{backgroundEffects.ts => backgroundEffectCatalog.ts} | 2 -- 7 files changed, 11 insertions(+), 9 deletions(-) rename src/tracks/{backgroundEffects.test.ts => backgroundEffectCatalog.test.ts} (97%) rename src/tracks/{backgroundEffects.ts => backgroundEffectCatalog.ts} (98%) diff --git a/src/components/CallFooterViewModel.tsx b/src/components/CallFooterViewModel.tsx index 708fb04bd..47b500f6c 100644 --- a/src/components/CallFooterViewModel.tsx +++ b/src/components/CallFooterViewModel.tsx @@ -9,7 +9,7 @@ import { combineLatest, map, type Observable, switchMap } from "rxjs"; import { supportsAudioOutputSelection } from "livekit-client"; import { supportsBackgroundProcessors } from "../tracks/backgroundProcessing"; -import { parseEffect } from "../tracks/backgroundEffects"; +import { parseEffect } from "../tracks/backgroundEffectCatalog"; import { type CallViewModel } from "../state/CallViewModel/CallViewModel"; import { type MenuOptions } from "./MediaMuteAndSwitchButton"; diff --git a/src/settings/SettingsModal.tsx b/src/settings/SettingsModal.tsx index 87191fc06..773c886e8 100644 --- a/src/settings/SettingsModal.tsx +++ b/src/settings/SettingsModal.tsx @@ -28,7 +28,10 @@ import { PreferencesSettingsTab } from "./PreferencesSettingsTab"; import { Slider } from "../Slider"; import { DeviceSelection } from "./DeviceSelection"; import { useBackgroundEffects } from "../tracks/BackgroundEffectsContext"; -import { parseEffect, serializeEffect } from "../tracks/backgroundEffects"; +import { + parseEffect, + serializeEffect, +} from "../tracks/backgroundEffectCatalog"; import { DeveloperSettingsTab, type DeveloperSettingsSnapshot, diff --git a/src/settings/settings.ts b/src/settings/settings.ts index e7d78b407..6e8f1f829 100644 --- a/src/settings/settings.ts +++ b/src/settings/settings.ts @@ -13,7 +13,7 @@ import { type Behavior } from "../state/Behavior"; import { useBehavior } from "../useBehavior"; import { MatrixRTCMode } from "../config/ConfigOptions"; import { type UnstableLivekitTransport } from "matrix-js-sdk/lib/matrixrtc"; -import { type EffectId } from "../tracks/backgroundEffects"; +import { type EffectId } from "../tracks/backgroundEffectCatalog"; export class Setting { public constructor( diff --git a/src/state/BackgroundEffects.test.ts b/src/state/BackgroundEffects.test.ts index d2ca00815..d00238dde 100644 --- a/src/state/BackgroundEffects.test.ts +++ b/src/state/BackgroundEffects.test.ts @@ -15,7 +15,7 @@ import { type BackgroundEffectsOptions, type BackgroundEffectsState, } from "./BackgroundEffects"; -import { shippedBackgrounds } from "../tracks/backgroundEffects"; +import { shippedBackgrounds } from "../tracks/backgroundEffectCatalog"; import { flushPromises, testScope, withTestScheduler } from "../utils/test"; /** A pipeline that records what it is switched to. */ diff --git a/src/state/BackgroundEffects.ts b/src/state/BackgroundEffects.ts index a79d1059a..df3ce6a95 100644 --- a/src/state/BackgroundEffects.ts +++ b/src/state/BackgroundEffects.ts @@ -21,10 +21,11 @@ import { type Behavior } from "./Behavior"; import { type ObservableScope } from "./ObservableScope"; import { type BackgroundEffect, - blurRadius, imagePathFor, parseEffect, -} from "../tracks/backgroundEffects"; +} from "../tracks/backgroundEffectCatalog"; + +const blurRadius = 15; export interface BackgroundEffectsState { supported: boolean | undefined; diff --git a/src/tracks/backgroundEffects.test.ts b/src/tracks/backgroundEffectCatalog.test.ts similarity index 97% rename from src/tracks/backgroundEffects.test.ts rename to src/tracks/backgroundEffectCatalog.test.ts index cac6901cc..6b6b13e99 100644 --- a/src/tracks/backgroundEffects.test.ts +++ b/src/tracks/backgroundEffectCatalog.test.ts @@ -14,7 +14,7 @@ import { parseEffect, serializeEffect, shippedBackgrounds, -} from "./backgroundEffects"; +} from "./backgroundEffectCatalog"; describe("the chosen background effect", () => { test("round-trips through its stored form", () => { diff --git a/src/tracks/backgroundEffects.ts b/src/tracks/backgroundEffectCatalog.ts similarity index 98% rename from src/tracks/backgroundEffects.ts rename to src/tracks/backgroundEffectCatalog.ts index 467c90d08..71c9e2d5d 100644 --- a/src/tracks/backgroundEffects.ts +++ b/src/tracks/backgroundEffectCatalog.ts @@ -8,8 +8,6 @@ Please see LICENSE in the repository root for full details. import arc from "../graphics/background-arc.jpg?url"; import glow from "../graphics/background-glow.jpg?url"; -export const blurRadius = 15; - export interface ShippedBackground { /** Stored in the user's settings when chosen, so it must not change. */ id: string;