Placed icon and begun work with code.

This commit is contained in:
Håvar Aambø Fosstveit
2018-06-21 15:25:40 +02:00
parent 81fcd136f4
commit fa94a62d9d
9 changed files with 447 additions and 232 deletions
+4 -4
View File
@@ -604,7 +604,7 @@ export default class RoomClient
{
for (const consumer of peer.consumers)
{
if (consumer.kind !== 'audio')
if (consumer.appData.source !== 'mic')
continue;
consumer.pause('mute-audio');
@@ -640,7 +640,7 @@ export default class RoomClient
{
for (const consumer of peer.consumers)
{
if (consumer.kind !== 'audio' || !consumer.supported)
if (consumer.appData.source !== 'mic' || !consumer.supported)
continue;
consumer.resume();
@@ -676,7 +676,7 @@ export default class RoomClient
{
for (const consumer of peer.consumers)
{
if (consumer.kind !== 'video')
if (consumer.appData.source !== 'webcam')
continue;
consumer.pause('pause-video');
@@ -712,7 +712,7 @@ export default class RoomClient
{
for (const consumer of peer.consumers)
{
if (consumer.kind !== 'video' || !consumer.supported)
if (consumer.appData.source !== 'webcam' || !consumer.supported)
continue;
consumer.resume();
+90
View File
@@ -0,0 +1,90 @@
import React from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import Spinner from 'react-spinner';
export default class FullView extends React.Component
{
constructor(props)
{
super(props);
// Latest received video track.
// @type {MediaStreamTrack}
this._videoTrack = null;
}
render()
{
const {
videoVisible,
videoProfile
} = this.props;
return (
<div data-component='ScreenView'>
<video
ref='video'
className={classnames({
hidden : !videoVisible,
loading : videoProfile === 'none'
})}
autoPlay
muted={Boolean(true)}
/>
{videoProfile === 'none' ?
<div className='spinner-container'>
<Spinner />
</div>
:null
}
</div>
);
}
componentDidMount()
{
const { videoTrack } = this.props;
this._setTracks(videoTrack);
}
componentWillReceiveProps(nextProps)
{
const { videoTrack } = nextProps;
this._setTracks(videoTrack);
}
_setTracks(videoTrack)
{
if (this._videoTrack === videoTrack)
return;
this._videoTrack = videoTrack;
const { video } = this.refs;
if (videoTrack)
{
const stream = new MediaStream;
if (videoTrack)
stream.addTrack(videoTrack);
video.srcObject = stream;
}
else
{
video.srcObject = null;
}
}
}
FullView.propTypes =
{
videoTrack : PropTypes.any,
videoVisible : PropTypes.bool,
videoProfile : PropTypes.string
};
+50 -40
View File
@@ -78,6 +78,11 @@ class Me extends React.Component
if (!me.displayNameSet)
tip = 'Click on your name to change it';
const style =
{
'width' : screenProducer ? '40vmin' : ''
};
return (
<div
data-component='Me'
@@ -85,52 +90,57 @@ class Me extends React.Component
data-tip={tip}
data-tip-disable={!tip}
data-type='dark'
style={style}
>
{connected ?
<div className='controls'>
<div
className={classnames('button', 'mic', micState, {
disabled : me.audioInProgress
})}
onClick={() =>
{
micState === 'on' ? onMuteMic() : onUnmuteMic();
}}
/>
<div className={classnames('view-container', 'webcam')}>
{connected ?
<div className='controls'>
<div
className={classnames('button', 'mic', micState, {
disabled : me.audioInProgress
})}
onClick={() =>
{
micState === 'on' ? onMuteMic() : onUnmuteMic();
}}
/>
<div
className={classnames('button', 'webcam', webcamState, {
disabled : me.webcamInProgress
})}
onClick={() =>
{
webcamState === 'on' ? onDisableWebcam() : onEnableWebcam();
}}
/>
</div>
:null
}
<div
className={classnames('button', 'webcam', webcamState, {
disabled : me.webcamInProgress
})}
onClick={() =>
{
webcamState === 'on' ? onDisableWebcam() : onEnableWebcam();
}}
/>
</div>
:null
}
<PeerView
isMe
advancedMode={advancedMode}
peer={me}
audioTrack={micProducer ? micProducer.track : null}
videoTrack={webcamProducer ? webcamProducer.track : null}
videoVisible={videoVisible}
audioCodec={micProducer ? micProducer.codec : null}
videoCodec={webcamProducer ? webcamProducer.codec : null}
onChangeDisplayName={(displayName) => onChangeDisplayName(displayName)}
/>
{screenProducer ?
<ScreenView
<PeerView
isMe
advancedMode={advancedMode}
screenTrack={screenProducer ? screenProducer.track : null}
screenVisible={screenVisible}
screenCodec={screenProducer ? screenProducer.codec : null}
peer={me}
audioTrack={micProducer ? micProducer.track : null}
videoTrack={webcamProducer ? webcamProducer.track : null}
videoVisible={videoVisible}
audioCodec={micProducer ? micProducer.codec : null}
videoCodec={webcamProducer ? webcamProducer.codec : null}
onChangeDisplayName={(displayName) => onChangeDisplayName(displayName)}
/>
</div>
{screenProducer ?
<div className={classnames('view-container', 'screen')}>
<ScreenView
isMe
advancedMode={advancedMode}
screenTrack={screenProducer ? screenProducer.track : null}
screenVisible={screenVisible}
screenCodec={screenProducer ? screenProducer.codec : null}
/>
</div>
:null
}
+91 -40
View File
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import classnames from 'classnames';
import * as appPropTypes from './appPropTypes';
import * as requestActions from '../redux/requestActions';
import * as stateActions from '../redux/stateActions';
import PeerView from './PeerView';
import ScreenView from './ScreenView';
@@ -19,6 +20,9 @@ const Peer = (props) =>
onUnmuteMic,
onDisableWebcam,
onEnableWebcam,
onDisableScreen,
onEnableScreen,
toggleConsumerFullscreen,
style
} = props;
@@ -57,35 +61,6 @@ const Peer = (props) =>
screen : screenConsumer
})}
>
<div className='controls'>
<div
className={classnames('button', 'mic', {
on : micEnabled,
off : !micEnabled,
disabled : peer.peerAudioInProgress
})}
onClick={(e) =>
{
e.stopPropagation();
micEnabled ? onMuteMic(peer.name) : onUnmuteMic(peer.name);
}}
/>
<div
className={classnames('button', 'webcam', {
on : videoVisible,
off : !videoVisible,
disabled : peer.peerVideoInProgress
})}
onClick={(e) =>
{
e.stopPropagation();
videoVisible ?
onDisableWebcam(peer.name) : onEnableWebcam(peer.name);
}}
/>
</div>
{videoVisible && !webcamConsumer.supported ?
<div className='incompatible-video'>
<p>incompatible video</p>
@@ -94,6 +69,43 @@ const Peer = (props) =>
}
<div className={classnames('view-container', 'webcam')} style={style}>
<div className='controls'>
<div
className={classnames('button', 'mic', {
on : micEnabled,
off : !micEnabled,
disabled : peer.peerAudioInProgress
})}
onClick={(e) =>
{
e.stopPropagation();
micEnabled ? onMuteMic(peer.name) : onUnmuteMic(peer.name);
}}
/>
<div
className={classnames('button', 'webcam', {
on : videoVisible,
off : !videoVisible,
disabled : peer.peerVideoInProgress
})}
onClick={(e) =>
{
e.stopPropagation();
videoVisible ?
onDisableWebcam(peer.name) : onEnableWebcam(peer.name);
}}
/>
<div
className={classnames('button', 'fullscreen')}
onClick={(e) =>
{
e.stopPropagation();
toggleConsumerFullscreen(webcamConsumer);
}}
/>
</div>
<PeerView
advancedMode={advancedMode}
peer={peer}
@@ -108,6 +120,30 @@ const Peer = (props) =>
{screenConsumer ?
<div className={classnames('view-container', 'screen')} style={style}>
<div className='controls'>
<div
className={classnames('button', 'screen', {
on : screenVisible,
off : !screenVisible,
disabled : peer.peerScreenInProgress
})}
onClick={(e) =>
{
e.stopPropagation();
screenVisible ?
onDisableScreen(peer.name) : onEnableScreen(peer.name);
}}
/>
<div
className={classnames('button', 'fullscreen')}
onClick={(e) =>
{
e.stopPropagation();
toggleConsumerFullscreen(screenConsumer);
}}
/>
</div>
<ScreenView
advancedMode={advancedMode}
screenTrack={screenConsumer ? screenConsumer.track : null}
@@ -124,17 +160,20 @@ const Peer = (props) =>
Peer.propTypes =
{
advancedMode : PropTypes.bool,
peer : appPropTypes.Peer.isRequired,
micConsumer : appPropTypes.Consumer,
webcamConsumer : appPropTypes.Consumer,
screenConsumer : appPropTypes.Consumer,
onMuteMic : PropTypes.func.isRequired,
onUnmuteMic : PropTypes.func.isRequired,
onEnableWebcam : PropTypes.func.isRequired,
onDisableWebcam : PropTypes.func.isRequired,
streamDimensions : PropTypes.object,
style : PropTypes.object
advancedMode : PropTypes.bool,
peer : appPropTypes.Peer.isRequired,
micConsumer : appPropTypes.Consumer,
webcamConsumer : appPropTypes.Consumer,
screenConsumer : appPropTypes.Consumer,
onMuteMic : PropTypes.func.isRequired,
onUnmuteMic : PropTypes.func.isRequired,
onEnableWebcam : PropTypes.func.isRequired,
onDisableWebcam : PropTypes.func.isRequired,
streamDimensions : PropTypes.object,
style : PropTypes.object,
onEnableScreen : PropTypes.func.isRequired,
onDisableScreen : PropTypes.func.isRequired,
toggleConsumerFullscreen : PropTypes.func.isRequired
};
const mapStateToProps = (state, { name }) =>
@@ -176,6 +215,18 @@ const mapDispatchToProps = (dispatch) =>
onDisableWebcam : (peerName) =>
{
dispatch(requestActions.pausePeerVideo(peerName));
},
onEnableScreen : (peerName) =>
{
dispatch(requestActions.resumePeerScreen(peerName));
},
onDisableScreen : (peerName) =>
{
dispatch(requestActions.pausePeerScreen(peerName));
},
toggleConsumerFullscreen : (consumer) =>
{
dispatch(stateActions.toggleConsumerFullscreen(consumer));
}
};
};