notify users who joined call if currently speaking

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/src/utils/webrtc/simplewebrtc/localmedia.js b/src/utils/webrtc/simplewebrtc/localmedia.js
index 916432755..2a287a0e7 100644
--- a/src/utils/webrtc/simplewebrtc/localmedia.js
+++ b/src/utils/webrtc/simplewebrtc/localmedia.js
@@ -63,15 +63,18 @@ function LocalMedia(opts) {
 
 	this._blackVideoEnforcer = new BlackVideoEnforcer()
 
+	this._speaking = undefined
 	this._speakingMonitor = new SpeakingMonitor()
 	this._speakingMonitor.on('speaking', () => {
 		this.emit('speaking')
+		this._speaking = true
 	})
 	this._speakingMonitor.on('speakingWhileMuted', () => {
 		this.emit('speakingWhileMuted')
 	})
 	this._speakingMonitor.on('stoppedSpeaking', () => {
 		this.emit('stoppedSpeaking')
+		this._speaking = false
 	})
 	this._speakingMonitor.on('stoppedSpeakingWhileMuted', () => {
 		this.emit('stoppedSpeakingWhileMuted')
@@ -416,6 +419,10 @@ LocalMedia.prototype._setVideoEnabled = function(bool) {
 	this._videoTrackEnabler.setEnabled(bool)
 }
 
+LocalMedia.prototype.isSpeaking = function() {
+	return this._speaking
+}
+
 // check if all audio streams are enabled
 LocalMedia.prototype.isAudioEnabled = function() {
 	let enabled = true
diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
index 526d7b139..71f062bbf 100644
--- a/src/utils/webrtc/webrtc.js
+++ b/src/utils/webrtc/webrtc.js
@@ -211,6 +211,12 @@ function sendCurrentMediaState() {
 		webrtc.webrtc.emit('audioOff')
 	} else {
 		webrtc.webrtc.emit('audioOn')
+
+		if (!webrtc.webrtc.isSpeaking()) {
+			webrtc.webrtc.emit('stoppedSpeaking')
+		} else {
+			webrtc.webrtc.emit('speaking')
+		}
 	}
 }
 
@@ -1601,7 +1607,7 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
 				const name = typeof (data.payload) === 'string' ? data.payload : data.payload.name
 				webrtc.emit('nick', { id: peer.id, name })
 			} else if (data.type === 'speaking' || data.type === 'stoppedSpeaking') {
-				// Valid known messages, but handled elsewhere
+				// Valid known messages, handled by CallParticipantModel.js
 			} else {
 				console.debug('Unknown message type %s from %s datachannel', data.type, label, data, peer.id, peer)
 			}
@@ -1633,10 +1639,10 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
 		}
 	})
 
+	// Send the speaking status events via data channel
 	webrtc.on('speaking', function() {
 		sendDataChannelToAll('status', 'speaking')
 	})
-
 	webrtc.on('stoppedSpeaking', function() {
 		sendDataChannelToAll('status', 'stoppedSpeaking')
 	})