xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Šimon Brandner 2022-08-13 18:28:27 +02:00
commit 4ac5c2c677
No known key found for this signature in database
GPG key ID: D1D45825D60C24D2
19 changed files with 74 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video-grid/VideoTileContainer.tsx
View file

@ -17,7 +17,7 @@ limitations under the License.
import { SDPStreamMetadataPurpose } from "matrix-js-sdk/src/webrtc/callEventTypes";
import React from "react";
import { useCallback } from "react";
import { RoomMember } from "matrix-js-sdk";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { useCallFeed } from "./useCallFeed";
import { useSpatialMediaStream } from "./useMediaStream";

2
src/video-grid/useCallFeed.ts
View file

@ -16,7 +16,7 @@ limitations under the License.
import { useState, useEffect } from "react";
import { CallFeed, CallFeedEvent } from "matrix-js-sdk/src/webrtc/callFeed";
import { RoomMember } from "matrix-js-sdk";
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { SDPStreamMetadataPurpose } from "matrix-js-sdk/src/webrtc/callEventTypes";
interface CallFeedState {

5
src/video-grid/useRoomMemberName.ts
View file

@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import { RoomMember, RoomMemberEvent } from "matrix-js-sdk";
import {
RoomMember,
RoomMemberEvent,
} from "matrix-js-sdk/src/models/room-member";
import { useState, useEffect } from "react";
interface RoomMemberName {