Šimon Brandner
|
65451805a2
|
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-03 16:06:12 +02:00 |
|
Šimon Brandner
|
0c30566cae
|
Fix import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-30 08:20:36 +02:00 |
|
Šimon Brandner
|
e0df785538
|
Mirror only usermedia feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-30 08:15:45 +02:00 |
|
Šimon Brandner
|
871f1b7a5c
|
Handle all possible playMedia() in componentDidUpdate()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-29 15:31:25 +02:00 |
|
Šimon Brandner
|
38a1b922bd
|
Add missing await
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-29 15:26:04 +02:00 |
|
Šimon Brandner
|
cb89dd408c
|
Use mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-29 15:05:26 +02:00 |
|
Šimon Brandner
|
ae64765870
|
playMedia only if necessary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-29 08:45:32 +02:00 |
|
Šimon Brandner
|
537ce40f42
|
Add a TODO
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-28 16:32:55 +02:00 |
|
Šimon Brandner
|
7c4e3efbff
|
Extend PureComponent to avoid unnecessary renders
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-28 15:11:31 +02:00 |
|
Šimon Brandner
|
91e65534fa
|
await setState to avoid races where we would try to play media without an HTMLVideoElement
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-28 15:04:33 +02:00 |
|
Šimon Brandner
|
bc11e215b8
|
Merge remote-tracking branch 'upstream/develop' into feature/muting
|
2021-07-27 18:14:23 +02:00 |
|
Šimon Brandner
|
36607fa8a2
|
Fix call crashing because element was undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 18:05:50 +02:00 |
|
Šimon Brandner
|
371de23b00
|
Merge remote-tracking branch 'upstream/develop' into feature/muting
|
2021-07-27 16:40:47 +02:00 |
|
Šimon Brandner
|
b9e305daae
|
Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 16:26:46 +02:00 |
|
Šimon Brandner
|
24f0c760ce
|
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 16:25:38 +02:00 |
|
Šimon Brandner
|
001490f70d
|
Fix unused resize listener
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 15:30:44 +02:00 |
|
Šimon Brandner
|
5dd34de5fe
|
Handle mute state changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 14:31:42 +02:00 |
|
Šimon Brandner
|
b762303102
|
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:10:01 +02:00 |
|
Michael Telatynski
|
f5630acea7
|
Adhere to better eslint rules
|
2021-07-23 10:35:10 +01:00 |
|
Šimon Brandner
|
c2aada6aa7
|
Clearer avatar sizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-21 21:27:07 +02:00 |
|
Šimon Brandner
|
3fac4adfc7
|
Fix feed sizing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-21 18:14:21 +02:00 |
|
Šimon Brandner
|
657896c0b9
|
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-07 11:00:42 +02:00 |
|
Šimon Brandner
|
fc239ffd01
|
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-07 10:53:22 +02:00 |
|
David Baker
|
80f5232217
|
Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
|
2021-07-01 23:23:03 +01:00 |
|
J. Ryan Stinnett
|
ae0a8b8da4
|
Auto-fix lint errors
|
2021-06-29 13:11:58 +01:00 |
|
Šimon Brandner
|
ed148de567
|
Derive mute state from props
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-12 12:16:52 +02:00 |
|
Šimon Brandner
|
e431f41e11
|
Fix feeds misbehaving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-12 10:48:32 +02:00 |
|
Šimon Brandner
|
1b2b4714e1
|
Properly handle feed prop updates
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-12 09:19:45 +02:00 |
|
Šimon Brandner
|
97b976b171
|
Adjust for sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-06-12 08:15:26 +02:00 |
|
Šimon Brandner
|
f949526078
|
Add a missing ;
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-05-20 15:54:47 +02:00 |
|
Šimon Brandner
|
430808ae2e
|
Simplifie CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-05-08 16:49:47 +02:00 |
|
Šimon Brandner
|
1f27354439
|
Add support for up to 4 feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-05-07 21:34:56 +02:00 |
|
Šimon Brandner
|
f3a7ffca60
|
Remove audio element from VideoFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-27 12:02:41 +02:00 |
|
Šimon Brandner
|
b612b252e1
|
Fix a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-27 11:59:26 +02:00 |
|
Šimon Brandner
|
fbb8cfb188
|
Rework how media element are handled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-23 19:41:55 +02:00 |
|
Šimon Brandner
|
758112dda9
|
Add missing somicolons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-19 07:42:32 +02:00 |
|
Šimon Brandner
|
33fd09d777
|
Make private
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-13 20:21:03 +02:00 |
|
Šimon Brandner
|
56b15edc58
|
Properly handle media
This might have resulted in the wrong speaker being used or worse
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-12 16:19:05 +02:00 |
|
Šimon Brandner
|
a3da5ee6e6
|
Don't play audio if the feed is local
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-08 14:32:53 +02:00 |
|
Šimon Brandner
|
9324dec0d6
|
Rename audioOnly to videoMuted
This makes more sense and will match a possible mute events MSC
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-04 08:50:25 +02:00 |
|
Šimon Brandner
|
346784e530
|
Add getMember() to CallFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-04 08:33:53 +02:00 |
|
Šimon Brandner
|
c5952f7e23
|
Remove VideoFeedType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-04-04 08:02:51 +02:00 |
|
Šimon Brandner
|
0917730f48
|
Merge branch 'feed' into feed-audio
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-17 16:14:59 +01:00 |
|
Šimon Brandner
|
431a2c033d
|
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-17 16:13:40 +01:00 |
|
Šimon Brandner
|
6c5a301094
|
Make sure video plays onNewStream
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-17 16:10:50 +01:00 |
|
Šimon Brandner
|
ec824c714a
|
Make sure video plays onNewStream
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-17 16:09:58 +01:00 |
|
Šimon Brandner
|
8410411236
|
Handle audio
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-10 12:26:59 +01:00 |
|
Šimon Brandner
|
bb13dc49a6
|
Make CallView use CallFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-10 12:18:57 +01:00 |
|
Travis Ralston
|
41576954fd
|
Batch of views getting replaceableComponent decorators
|
2021-03-08 20:23:54 -07:00 |
|
Šimon Brandner
|
69cdbef3d6
|
Remove maxHeight prop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-03-02 20:31:39 +01:00 |
|