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

Fix for last not correctly working merge - sorry for the mess!

Browse Source
This commit is contained in:
Stefan Otto
2018-04-24 14:51:37 +02:00
parent 7dfaeb65b5
commit cc7e491a90
1 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/components/Peer.jsx
-23
View File
@@ -40,21 +40,6 @@ const Peer = (props) =>
if (screenConsumer) if (screenConsumer)
screenProfile = screenConsumer.profile; screenProfile = screenConsumer.profile;
if (screenVisible && screenConsumer.supported)
{
return (
<div data-component='Peer'>
<PeerScreenView
videoTrack={screenConsumer ? screenConsumer.track : null}
videoVisible={screenVisible}
videoProfile={screenProfile}
videoCodec={screenConsumer ? screenConsumer.codec : null}
/>
</div>
);
}
else
{
return ( return (
<div data-component='Peer'> <div data-component='Peer'>
<div className='indicators'> <div className='indicators'>
@@ -78,14 +63,6 @@ const Peer = (props) =>
</div> </div>
:null :null
} }
</div>
{videoVisible && !webcamConsumer.supported ?
<div className='incompatible-video'>
<p>incompatible video</p>
</div>
:null
}
<PeerView <PeerView
peer={peer} peer={peer}