Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature-ptt' into develop

auto_join_3.3
Stefan Otto 2020-03-28 00:51:21 +01:00
parent a1dc652d04 de0cb99656
commit eef2c439f0
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/RoomClient.js
View File

@ -2486,7 +2486,11 @@ export default class RoomClient
{ {
if (this._mediasoupDevice.canProduce('audio')) if (this._mediasoupDevice.canProduce('audio'))
if (!this._muted) if (!this._muted)
this.enableMic(); {
await this.enableMic();
if (peers.length > 4)
this.muteMic();
}
if (joinVideo && this._mediasoupDevice.canProduce('video')) if (joinVideo && this._mediasoupDevice.canProduce('video'))
this.enableWebcam(); this.enableWebcam();

42
app/src/components/Containers/Me.js
View File

@ -68,40 +68,42 @@ const styles = (theme) =>
}, },
controls : controls :
{ {
position : 'absolute', position : 'absolute',
width : '100%', width : '100%',
height : '100%', height : '100%',
display : 'flex', backgroundColor : 'rgba(0, 0, 0, 0.3)',
flexDirection : 'column', display : 'flex',
justifyContent : 'center', flexDirection : 'column',
alignItems : 'flex-end', justifyContent : 'center',
padding : theme.spacing(1), alignItems : 'flex-end',
zIndex : 21, padding : theme.spacing(1),
touchAction : 'none', zIndex : 21,
pointerEvents : 'none', opacity : 1,
'& p' : transition : 'opacity 0.3s',
touchAction : 'none',
pointerEvents : 'none',
'& p' :
{ {
position : 'absolute', position : 'absolute',
float : 'left', float : 'left',
top : '50%', top : '50%',
left : '50%', left : '50%',
opacity : 0,
transition : 'opacity 0.3s',
transform : 'translate(-50%, -50%)', transform : 'translate(-50%, -50%)',
color : 'rgba(255, 255, 255, 0.5)', color : 'rgba(255, 255, 255, 0.5)',
fontSize : '7em', fontSize : '7em',
margin : 0, margin : 0,
'&.hover' : opacity : 0,
'&.hover' :
{ {
opacity : 1 opacity : 1
} },
} }
}, },
ptt : ptt :
{ {
position : 'absolute', position : 'absolute',
float : 'left', float : 'left',
bottom : '10%', top : '10%',
left : '50%', left : '50%',
transform : 'translate(-50%, 0%)', transform : 'translate(-50%, 0%)',
color : 'rgba(255, 255, 255, 0.7)', color : 'rgba(255, 255, 255, 0.7)',
@ -112,7 +114,7 @@ const styles = (theme) =>
borderRadius : '20px', borderRadius : '20px',
textAlign : 'center', textAlign : 'center',
opacity : 0, opacity : 0,
'&.enabled' : '&.enabled' :
{ {
opacity : 1 opacity : 1
} }
@ -291,7 +293,7 @@ const Me = (props) =>
> >
<div className={classnames(classes.viewContainer)} style={style}> <div className={classnames(classes.viewContainer)} style={style}>
<div <div
className={classnames(classes.controls, 'hover')} className={classnames(classes.controls)}
onMouseOver={() => setHover(true)} onMouseOver={() => setHover(true)}
onMouseOut={() => setHover(false)} onMouseOut={() => setHover(false)}
onTouchStart={() => onTouchStart={() =>
@ -312,7 +314,7 @@ const Me = (props) =>
}, 2000); }, 2000);
}} }}
> >
<p className={classnames(hover ? 'hover' : null)}> <p className={classnames(hover && 'hover')}>
<FormattedMessage <FormattedMessage
id='room.me' id='room.me'
defaultMessage='ME' defaultMessage='ME'