Skip to content

Commit 745fa6c

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

8 files changed

+110
-154
lines changed

src/App.tsx

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const ThemeProvider: FC<SimpleProviderProps> = ({ children }) => {
5555
};
5656

5757
export const App: FC = () => {
58-
// const { controlledOutput } = useUrlParams();
5958
const [loaded, setLoaded] = useState(false);
6059
useEffect(() => {
6160
Initializer.init()
@@ -67,20 +66,6 @@ export const App: FC = () => {
6766
.catch(logger.error);
6867
});
6968

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-
8469
return (
8570
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
8671
// @ts-ignore
@@ -92,13 +77,24 @@ export const App: FC = () => {
9277
<Suspense fallback={null}>
9378
<ClientProvider>
9479
<ProcessorProvider>
95-
{true ? (
96-
<ControlledOutputMediaDevicesProvider>
97-
{inner}
98-
</ControlledOutputMediaDevicesProvider>
99-
) : (
100-
<MediaDevicesProvider>{inner}</MediaDevicesProvider>
101-
)}
80+
<MediaDevicesProvider>
81+
<Sentry.ErrorBoundary
82+
fallback={(error) => (
83+
<ErrorPage error={error} widget={widget} />
84+
)}
85+
>
86+
<DisconnectedBanner />
87+
<Routes>
88+
<SentryRoute path="/" element={<HomePage />} />
89+
<SentryRoute path="/login" element={<LoginPage />} />
90+
<SentryRoute
91+
path="/register"
92+
element={<RegisterPage />}
93+
/>
94+
<SentryRoute path="*" element={<RoomPage />} />
95+
</Routes>
96+
</Sentry.ErrorBoundary>
97+
</MediaDevicesProvider>
10298
</ProcessorProvider>
10399
</ClientProvider>
104100
</Suspense>

0 commit comments

Comments
 (0)