Use ES6

JitsiConference.js

@@ -18,9 +18,9 @@ var GlobalOnErrorHandler = require("./modules/util/GlobalOnErrorHandler");
 var JitsiConferenceEventManager = require("./JitsiConferenceEventManager");
 var VideoType = require('./service/RTC/VideoType');
 var Transcriber = require("./modules/transcription/transcriber");
-var TalkMutedDetection = require("./modules/talkmuted/TalkMutedDetection");
 var ParticipantConnectionStatus
     = require("./modules/connectivity/ParticipantConnectionStatus");
+import TalkMutedDetection from "./modules/talkmuted/TalkMutedDetection";
 
 /**
  * Creates a JitsiConference object with the given name and properties.
@@ -119,9 +119,10 @@ JitsiConference.prototype._init = function (options) {
     this.eventManager.setupStatisticsListeners();
 
     if (this.options.config.enableTalkWhileMuted) {
-        this.talkMutedDetection = new TalkMutedDetection(function () {
-            this.eventEmitter.emit(JitsiConferenceEvents.TALK_WHILE_MUTED);
-        }.bind(this));
+        this.talkMutedDetection
+            = new TalkMutedDetection(() => {
+                this.eventEmitter.emit(JitsiConferenceEvents.TALK_WHILE_MUTED);
+            });
         this.statistics.addAudioLevelListener(
             this.talkMutedDetection.audioLevelListener
                 .bind(this.talkMutedDetection));

modules/statistics/RTPStatsCollector.js

@@ -752,11 +752,6 @@ StatsCollector.prototype.processAudioLevelReport = function () {
         if (now.type != 'ssrc')
             continue;
 
-        var isLocal = false;
-        if (!getStatValue(now, 'packetsReceived')) {
-            isLocal = true;
-        }
-
         var before = this.baselineAudioLevelsReport[idx];
         var ssrc = getStatValue(now, 'ssrc');
         if (!before) {
@@ -787,6 +782,8 @@ StatsCollector.prototype.processAudioLevelReport = function () {
         }
 
         if (audioLevel) {
+            const isLocal = !getStatValue(now, 'packetsReceived');
+
             // TODO: can't find specs about what this value really is,
             // but it seems to vary between 0 and around 32k.
             audioLevel = audioLevel / 32767;

modules/talkmuted/TalkMutedDetection.js

@@ -1,26 +1,26 @@
-var JitsiTrackEvents = require('../../JitsiTrackEvents');
-
-/**
- * Creates TalkMutedDetection
- * @param callback the callback to call when detected local user is talking
- * while its microphone is muted.
- * @constructor
- */
-function TalkMutedDetection(callback) {
-    this.callback = callback;
-
-    // we track firing the event, in order to avoid sending too many events
-    this.eventFired = false;
-}
-
-/**
- * Receives audio level events for all send/receive streams.
- * @param ssrc the ssrc of the stream
- * @param level the current audio level
- * @param isLocal whether this is local or remote stream (sent or received)
- */
-TalkMutedDetection.prototype.audioLevelListener =
-    function (ssrc, level, isLocal) {
+import * as JitsiTrackEvents from '../../JitsiTrackEvents';
+
+export default class TalkMutedDetection {
+    /**
+     * Creates TalkMutedDetection
+     * @param callback the callback to call when detected local user is talking
+     * while its microphone is muted.
+     * @constructor
+     */
+    constructor(callback) {
+        this.callback = callback;
+
+        // we track firing the event, in order to avoid sending too many events
+        this.eventFired = false;
+    }
+
+    /**
+     * Receives audio level events for all send/receive streams.
+     * @param ssrc the ssrc of the stream
+     * @param level the current audio level
+     * @param isLocal whether this is local or remote stream (sent or received)
+     */
+    audioLevelListener(ssrc, level, isLocal) {
         // we are interested only in local audio stream
         // and if event is not already sent
         if (!isLocal || !this.audioTrack || this.eventFired)
@@ -30,29 +30,28 @@ TalkMutedDetection.prototype.audioLevelListener =
             this.eventFired = true;
             this.callback();
         }
-    };
-
-/**
- * Mute changed for a track.
- * @param track the track which mute state has changed.
- */
-TalkMutedDetection.prototype.muteChanged = function (track) {
-    if (!track.isLocal() || !track.isAudioTrack())
-        return;
-
-    if (track.isMuted())
-        this.eventFired = false;
-};
+    }
+
+    /**
+     * Mute changed for a track.
+     * @param track the track which mute state has changed.
+     */
+    muteChanged(track) {
+        if (!track.isLocal() || !track.isAudioTrack())
+            return;
 
-/**
- * Adds local tracks. We are interested only in the audio one.
- * @param track
- */
-TalkMutedDetection.prototype.addTrack = function(track){
-    if (!track.isAudioTrack())
-        return;
+        if (track.isMuted())
+            this.eventFired = false;
+    }
 
-    this.audioTrack = track;
-};
+    /**
+     * Adds local tracks. We are interested only in the audio one.
+     * @param track
+     */
+    addTrack(track) {
+        if (!track.isAudioTrack())
+            return;
 
-module.exports = TalkMutedDetection;
+        this.audioTrack = track;
+    }
+}