Merge branch 'develop' into resizable-call-view

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-03-16 07:55:56 +01:00
commit 787a62846e
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
443 changed files with 9283 additions and 1925 deletions

View file

@ -18,6 +18,7 @@ import classnames from 'classnames';
import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import React, {createRef} from 'react';
import SettingsStore from "../../../settings/SettingsStore";
import {replaceableComponent} from "../../../utils/replaceableComponent";
export enum VideoFeedType {
Local,
@ -34,6 +35,7 @@ interface IProps {
onResize?: (e: Event) => void,
}
@replaceableComponent("views.voip.VideoFeed")
export default class VideoFeed extends React.Component<IProps> {
private vid = createRef<HTMLVideoElement>();