Merge remote-tracking branch 'upstream/main' into SimonBrandner/fix/audio

This commit is contained in:
Šimon Brandner
2022-08-13 18:28:27 +02:00
19 changed files with 74 additions and 36 deletions

View File

@@ -16,7 +16,9 @@ limitations under the License.
import React, { useCallback, useMemo, useRef } from "react";
import { usePreventScroll } from "@react-aria/overlays";
import { GroupCall, MatrixClient, RoomMember } from "matrix-js-sdk";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
import classNames from "classnames";