Removed video mute from ParticipanyList, improved audio indicator in ParticipantList

app/lib/components/HiddenPeers.jsx

@@ -38,7 +38,9 @@ class HiddenPeers extends Component
 			>
 				<div data-component='HiddenPeersView'>
 					<div className='view-container' onClick={() => openUsersTab()}>
-						<p>+{lastNLength} <br /> participant(s)</p>
+						<p>+{lastNLength} <br /> participant
+							{(lastNLength === 1) ? null : 's'}
+						</p>
 					</div>
 				</div>
 			</div>

app/lib/components/ParticipantList/ListPeer.jsx

@@ -10,12 +10,9 @@ const ListPeer = (props) =>
 	const {
 		peer,
 		micConsumer,
-		webcamConsumer,
 		screenConsumer,
 		onMuteMic,
 		onUnmuteMic,
-		onDisableWebcam,
-		onEnableWebcam,
 		onDisableScreen,
 		onEnableScreen
 	} = props;
@@ -26,12 +23,6 @@ const ListPeer = (props) =>
 		!micConsumer.remotelyPaused
 	);
 
-	const videoVisible = (
-		Boolean(webcamConsumer) &&
-		!webcamConsumer.locallyPaused &&
-		!webcamConsumer.remotelyPaused
-	);
-
 	const screenVisible = (
 		Boolean(screenConsumer) &&
 		!screenConsumer.locallyPaused &&
@@ -61,6 +52,9 @@ const ListPeer = (props) =>
 					:null
 				}
 			</div>
+			<div className='volume-container'>
+				<div className={classnames('bar', `level${micEnabled && micConsumer ? micConsumer.volume:0}`)} />
+			</div>
 			<div className='controls'>
 				{ screenConsumer ?
 					<div
@@ -84,28 +78,12 @@ const ListPeer = (props) =>
 						off      : !micEnabled,
 						disabled : peer.peerAudioInProgress
 					})}
-					style={{ opacity : micEnabled && micConsumer ? (micConsumer.volume/10)
-						+ 0.2 :1 }}
 					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>
 		</div>
 	);