Skip to content

Commit 7fa534d

Browse files
committed
refactor
- `MediaDevice`->`MediaDeviceHandle` - use just one provider and switch inside the MediaDevicesProvider between: controlledAudioOutput, webViewAudioOutput - fix muteAllAudio
1 parent c8091ac commit 7fa534d

File tree

8 files changed

+111
-158
lines changed

8 files changed

+111
-158
lines changed

src/App.tsx

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ import { ClientProvider } from "./ClientContext";
1919
import { ErrorPage, LoadingPage } from "./FullScreenView";
2020
import { DisconnectedBanner } from "./DisconnectedBanner";
2121
import { Initializer } from "./initializer";
22-
import {
23-
ControlledOutputMediaDevicesProvider,
24-
MediaDevicesProvider,
25-
} from "./livekit/MediaDevicesContext";
22+
import { MediaDevicesProvider } from "./livekit/MediaDevicesContext";
2623
import { widget } from "./widget";
2724
import { useTheme } from "./useTheme";
2825
import { ProcessorProvider } from "./livekit/TrackProcessorContext";
@@ -55,7 +52,6 @@ const ThemeProvider: FC<SimpleProviderProps> = ({ children }) => {
5552
};
5653

5754
export const App: FC = () => {
58-
// const { controlledOutput } = useUrlParams();
5955
const [loaded, setLoaded] = useState(false);
6056
useEffect(() => {
6157
Initializer.init()
@@ -67,20 +63,6 @@ export const App: FC = () => {
6763
.catch(logger.error);
6864
});
6965

70-
const inner = (
71-
<Sentry.ErrorBoundary
72-
fallback={(error) => <ErrorPage error={error} widget={widget} />}
73-
>
74-
<DisconnectedBanner />
75-
<Routes>
76-
<SentryRoute path="/" element={<HomePage />} />
77-
<SentryRoute path="/login" element={<LoginPage />} />
78-
<SentryRoute path="/register" element={<RegisterPage />} />
79-
<SentryRoute path="*" element={<RoomPage />} />
80-
</Routes>
81-
</Sentry.ErrorBoundary>
82-
);
83-
8466
return (
8567
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
8668
// @ts-ignore
@@ -92,13 +74,24 @@ export const App: FC = () => {
9274
<Suspense fallback={null}>
9375
<ClientProvider>
9476
<ProcessorProvider>
95-
{true ? (
96-
<ControlledOutputMediaDevicesProvider>
97-
{inner}
98-
</ControlledOutputMediaDevicesProvider>
99-
) : (
100-
<MediaDevicesProvider>{inner}</MediaDevicesProvider>
101-
)}
77+
<MediaDevicesProvider>
78+
<Sentry.ErrorBoundary
79+
fallback={(error) => (
80+
<ErrorPage error={error} widget={widget} />
81+
)}
82+
>
83+
<DisconnectedBanner />
84+
<Routes>
85+
<SentryRoute path="/" element={<HomePage />} />
86+
<SentryRoute path="/login" element={<LoginPage />} />
87+
<SentryRoute
88+
path="/register"
89+
element={<RegisterPage />}
90+
/>
91+
<SentryRoute path="*" element={<RoomPage />} />
92+
</Routes>
93+
</Sentry.ErrorBoundary>
94+
</MediaDevicesProvider>
10295
</ProcessorProvider>
10396
</ClientProvider>
10497
</Suspense>

0 commit comments

Comments
 (0)