From 2ee2728c412af8c7d9b9e8313fcc6b22ba14d338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Tue, 30 Oct 2018 10:25:13 +0100
Subject: [PATCH] Fixed updating of device names in device selection

---
 app/lib/RoomClient.js | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/app/lib/RoomClient.js b/app/lib/RoomClient.js
index 0f4d10b..54f6fa0 100644
--- a/app/lib/RoomClient.js
+++ b/app/lib/RoomClient.js
@@ -453,7 +453,6 @@ export default class RoomClient
 
 		try
 		{
-			await this._updateWebcams();
 			await this._setWebcamProducer();
 		}
 		catch (error)
@@ -1275,10 +1274,6 @@ export default class RoomClient
 
 		try
 		{
-			logger.debug('_setMicProducer() | calling _updateAudioDevices()');
-
-			await this._updateAudioDevices();
-
 			logger.debug('_setMicProducer() | calling getUserMedia()');
 
 			const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
@@ -1305,6 +1300,10 @@ export default class RoomClient
 					codec          : producer.rtpParameters.codecs[0].name
 				}));
 
+			logger.debug('_setMicProducer() | calling _updateAudioDevices()');
+
+			await this._updateAudioDevices();
+
 			producer.on('close', (originator) =>
 			{
 				logger.debug(
@@ -1498,18 +1497,12 @@ export default class RoomClient
 
 		try
 		{
-			const { device } = this._webcam;
-
-			if (!device)
-				throw new Error('no webcam devices');
-
 			logger.debug('_setWebcamProducer() | calling getUserMedia()');
 
 			const stream = await navigator.mediaDevices.getUserMedia(
 				{
 					video :
 					{
-						deviceId : { exact: device.deviceId },
 						...VIDEO_CONSTRAINS
 					}
 				});
@@ -1531,14 +1524,15 @@ export default class RoomClient
 				{
 					id             : producer.id,
 					source         : 'webcam',
-					deviceLabel    : device.label,
-					type           : this._getWebcamType(device),
 					locallyPaused  : producer.locallyPaused,
 					remotelyPaused : producer.remotelyPaused,
 					track          : producer.track,
 					codec          : producer.rtpParameters.codecs[0].name
 				}));
 
+			logger.debug('_setWebcamProducer() | calling _updateWebcams()');
+			await this._updateWebcams();
+
 			producer.on('close', (originator) =>
 			{
 				logger.debug(
@@ -1683,22 +1677,6 @@ export default class RoomClient
 		}
 	}
 
-	_getWebcamType(device)
-	{
-		if (/(back|rear)/i.test(device.label))
-		{
-			logger.debug('_getWebcamType() | it seems to be a back camera');
-
-			return 'back';
-		}
-		else
-		{
-			logger.debug('_getWebcamType() | it seems to be a front camera');
-
-			return 'front';
-		}
-	}
-
 	_handlePeer(peer, { notify = true } = {})
 	{
 		const displayName = peer.appData.displayName;