From df913500033274166483c34b82e0c5737edc5ec2 Mon Sep 17 00:00:00 2001
From: isymchych <ivansymchych@gmail.com>
Date: Thu, 19 Nov 2015 16:20:54 +0200
Subject: [PATCH 1/2] Use Object.defineProperty instead of
 Object.prototype._defineGetter_

---
 modules/xmpp/TraceablePeerConnection.js | 73 +++++++++++++------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/modules/xmpp/TraceablePeerConnection.js b/modules/xmpp/TraceablePeerConnection.js
index dc9606ae7..f9e50f0c6 100644
--- a/modules/xmpp/TraceablePeerConnection.js
+++ b/modules/xmpp/TraceablePeerConnection.js
@@ -206,45 +206,49 @@ var normalizePlanB = function(desc) {
     });
 };
 
-if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
-    TraceablePeerConnection.prototype.__defineGetter__(
-        'signalingState',
-        function() { return this.peerconnection.signalingState; });
-    TraceablePeerConnection.prototype.__defineGetter__(
-        'iceConnectionState',
-        function() { return this.peerconnection.iceConnectionState; });
-    TraceablePeerConnection.prototype.__defineGetter__(
-        'localDescription',
-        function() {
-            var desc = this.peerconnection.localDescription;
+var getters = {
+    signalingState: function () {
+        return this.peerconnection.signalingState;
+    },
+    iceConnectionState: function () {
+        return this.peerconnection.iceConnectionState;
+    },
+    localDescription:  function() {
+        var desc = this.peerconnection.localDescription;
 
             // TODO this should be after the Unified Plan -> Plan B
             // transformation.
-            desc = SSRCReplacement.mungeLocalVideoSSRC(desc);
-            
-            this.trace('getLocalDescription::preTransform', dumpSDP(desc));
+        desc = SSRCReplacement.mungeLocalVideoSSRC(desc);
 
-            // if we're running on FF, transform to Plan B first.
-            if (RTCBrowserType.usesUnifiedPlan()) {
-                desc = this.interop.toPlanB(desc);
-                this.trace('getLocalDescription::postTransform (Plan B)', dumpSDP(desc));
-            }
-            return desc;
-        });
-    TraceablePeerConnection.prototype.__defineGetter__(
-        'remoteDescription',
-        function() {
-            var desc = this.peerconnection.remoteDescription;
-            this.trace('getRemoteDescription::preTransform', dumpSDP(desc));
+        this.trace('getLocalDescription::preTransform', dumpSDP(desc));
 
-            // if we're running on FF, transform to Plan B first.
-            if (RTCBrowserType.usesUnifiedPlan()) {
-                desc = this.interop.toPlanB(desc);
-                this.trace('getRemoteDescription::postTransform (Plan B)', dumpSDP(desc));
-            }
-            return desc;
-        });
-}
+        // if we're running on FF, transform to Plan B first.
+        if (RTCBrowserType.usesUnifiedPlan()) {
+            desc = this.interop.toPlanB(desc);
+            this.trace('getLocalDescription::postTransform (Plan B)', dumpSDP(desc));
+        }
+        return desc;
+    },
+    remoteDescription:  function() {
+        var desc = this.peerconnection.remoteDescription;
+        this.trace('getRemoteDescription::preTransform', dumpSDP(desc));
+
+        // if we're running on FF, transform to Plan B first.
+        if (RTCBrowserType.usesUnifiedPlan()) {
+            desc = this.interop.toPlanB(desc);
+            this.trace('getRemoteDescription::postTransform (Plan B)', dumpSDP(desc));
+        }
+        return desc;
+    }
+};
+Object.keys(getters).forEach(function (prop) {
+    Object.defineProperty(
+        TraceablePeerConnection.prototype,
+        prop, {
+            get: getters[prop]
+        }
+    );
+});
 
 TraceablePeerConnection.prototype.addStream = function (stream) {
     this.trace('addStream', stream.id);
@@ -443,4 +447,3 @@ TraceablePeerConnection.prototype.getStats = function(callback, errback) {
 };
 
 module.exports = TraceablePeerConnection;
-

From d9b175c7a87220a1ffcdabd4425068c9c1495cc8 Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Tue, 8 Dec 2015 20:25:39 +1100
Subject: [PATCH 2/2] Fixes the issues with mute, audio levels and remove
 events that were attached to the conference

---
 JitsiConference.js                        | 122 ++++--
 JitsiMeetJS.js                            |  23 +-
 JitsiTrackErrors.js                       |   3 +-
 JitsiTrackEvents.js                       |   2 +-
 doc/example/example.js                    |  37 +-
 lib-jitsi-meet.js                         | 478 +++++++++++++---------
 modules/RTC/JitsiLocalTrack.js            |  33 +-
 modules/RTC/JitsiRemoteTrack.js           |  21 +-
 modules/RTC/JitsiTrack.js                 |  41 ++
 modules/RTC/RTC.js                        |  75 +---
 modules/statistics/LocalStatsCollector.js |  16 +-
 modules/statistics/statistics.js          |  43 +-
 modules/xmpp/ChatRoom.js                  |   4 +-
 modules/xmpp/JingleSessionPC.js           |  37 ++
 modules/xmpp/xmpp.js                      |   3 +-
 15 files changed, 576 insertions(+), 362 deletions(-)

diff --git a/JitsiConference.js b/JitsiConference.js
index ed3978b72..87e8a3f94 100644
--- a/JitsiConference.js
+++ b/JitsiConference.js
@@ -2,12 +2,12 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTC = require("./modules/RTC/RTC");
 var XMPPEvents = require("./service/xmpp/XMPPEvents");
-var StreamEventTypes = require("./service/RTC/StreamEventTypes");
 var RTCEvents = require("./service/RTC/RTCEvents");
 var EventEmitter = require("events");
 var JitsiConferenceEvents = require("./JitsiConferenceEvents");
 var JitsiParticipant = require("./JitsiParticipant");
 var Statistics = require("./modules/statistics/statistics");
+var JitsiTrackEvents = require("./JitsiTrackEvents");
 
 /**
  * Creates a JitsiConference object with the given name and properties.
@@ -32,7 +32,7 @@ function JitsiConference(options) {
     this.room = this.xmpp.createRoom(this.options.name, null, null, this.options.config);
     this.room.updateDeviceAvailability(RTC.getDeviceAvailability());
     this.rtc = new RTC(this.room, options);
-    if(!options.config.disableAudioLevels)
+    if(!RTC.options.disableAudioLevels)
         this.statistics = new Statistics();
     setupListeners(this);
     this.participants = {};
@@ -88,15 +88,16 @@ JitsiConference.prototype.on = function (eventId, handler) {
  */
 JitsiConference.prototype.off = function (eventId, handler) {
     if(this.eventEmitter)
-        this.eventEmitter.removeListener(eventId, listener);
+        this.eventEmitter.removeListener(eventId, handler);
 }
 
 // Common aliases for event emitter
-JitsiConference.prototype.addEventListener = JitsiConference.prototype.on
-JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off
+JitsiConference.prototype.addEventListener = JitsiConference.prototype.on;
+JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off;
 
 /**
- * Receives notifications from another participants for commands / custom events(send by sendPresenceCommand method).
+ * Receives notifications from another participants for commands / custom events
+ * (send by sendPresenceCommand method).
  * @param command {String} the name of the command
  * @param handler {Function} handler for the command
  */
@@ -172,17 +173,55 @@ JitsiConference.prototype.setDisplayName = function(name) {
  * @param track the JitsiLocalTrack object.
  */
 JitsiConference.prototype.addTrack = function (track) {
-    this.rtc.addLocalStream(track);
-    this.room.addStream(track.getOriginalStream(), function () {});
+    this.room.addStream(track.getOriginalStream(), function () {
+        this.rtc.addLocalStream(track);
+        var muteHandler = this._fireMuteChangeEvent.bind(this, track);
+        var stopHandler = this.removeTrack.bind(this, track);
+        var audioLevelHandler = this._fireAudioLevelChangeEvent.bind(this);
+        track.addEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED, muteHandler);
+        track.addEventListener(JitsiTrackEvents.TRACK_STOPPED, stopHandler);
+        track.addEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+            audioLevelHandler);
+        this.addEventListener(JitsiConferenceEvents.TRACK_REMOVED, function (track) {
+            track.removeEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
+                muteHandler);
+            track.removeEventListener(JitsiTrackEvents.TRACK_STOPPED,
+                stopHandler);
+            track.removeEventListener(
+                JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED, audioLevelHandler);
+        })
+        this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
+    }.bind(this));
+
 }
 
+/**
+ * Fires TRACK_AUDIO_LEVEL_CHANGED change conference event.
+ * @param audioLevel the audio level
+ */
+JitsiConference.prototype._fireAudioLevelChangeEvent = function (audioLevel) {
+    this.eventEmitter.emit(
+        JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
+        this.myUserId(), audioLevel);
+}
+
+/**
+ * Fires TRACK_MUTE_CHANGED change conference event.
+ * @param track the JitsiTrack object related to the event.
+ */
+JitsiConference.prototype._fireMuteChangeEvent = function (track) {
+    this.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
+};
+
 /**
  * Removes JitsiLocalTrack object to the conference.
  * @param track the JitsiLocalTrack object.
  */
 JitsiConference.prototype.removeTrack = function (track) {
-    this.room.removeStream(track.getOriginalStream());
-    this.rtc.removeLocalStream(track);
+    this.room.removeStream(track.getOriginalStream(), function(){
+        this.rtc.removeLocalStream(track);
+        this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+    }.bind(this));
 }
 
 /**
@@ -247,8 +286,33 @@ function setupListeners(conference) {
         if(conference.statistics)
             conference.statistics.startRemoteStats(event.peerconnection);
     });
+
     conference.room.addListener(XMPPEvents.REMOTE_STREAM_RECEIVED,
-        conference.rtc.createRemoteStream.bind(conference.rtc));
+        function (data, sid, thessrc) {
+            var track = conference.rtc.createRemoteStream(data, sid, thessrc);
+            if(!track)
+                return;
+            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED,
+                track);
+            track.addEventListener(JitsiTrackEvents.TRACK_STOPPED,
+                function () {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_REMOVED, track);
+                });
+            track.addEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
+                function () {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
+                });
+            var userId = track.getParitcipantId();
+            track.addEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                function (audioLevel) {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                        userId, audioLevel);
+                });
+        }
+    );
 
     conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_JOINED);
@@ -285,25 +349,6 @@ function setupListeners(conference) {
         conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED);
     });
 
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED,
-        function (stream) {
-            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, stream);
-        });
-
-//FIXME: Maybe remove event should not be associated with the conference.
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, function (stream) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
-    });
-//FIXME: Maybe remove event should not be associated with the conference.
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, function (stream) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
-        conference.removeTrack(stream);
-    });
-
-    conference.rtc.addListener(StreamEventTypes.TRACK_MUTE_CHANGED, function (track) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
-    });
-
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
         if(conference.lastActiveSpeaker !== id && conference.room) {
             conference.lastActiveSpeaker = id;
@@ -325,20 +370,11 @@ function setupListeners(conference) {
         //FIXME: Maybe remove event should not be associated with the conference.
         conference.statistics.addAudioLevelListener(function (ssrc, level) {
             var userId = null;
-            if (ssrc === Statistics.LOCAL_JID) {
-                userId = conference.myUserId();
-            } else {
-                var jid = conference.room.getJidBySSRC(ssrc);
-                if (!jid)
-                    return;
+            var jid = conference.room.getJidBySSRC(ssrc);
+            if (!jid)
+                return;
 
-                userId = Strophe.getResourceFromJid(jid);
-            }
-            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
-                userId, level);
-        });
-        conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_CREATED, function (stream) {
-            conference.statistics.startLocalStats(stream);
+            conference.rtc.setAudioLevel(jid, level);
         });
         conference.xmpp.addListener(XMPPEvents.DISPOSE_CONFERENCE,
             function () {
diff --git a/JitsiMeetJS.js b/JitsiMeetJS.js
index 4659357b0..24d5be77e 100644
--- a/JitsiMeetJS.js
+++ b/JitsiMeetJS.js
@@ -7,6 +7,7 @@ var JitsiTrackEvents = require("./JitsiTrackEvents");
 var JitsiTrackErrors = require("./JitsiTrackErrors");
 var Logger = require("jitsi-meet-logger");
 var RTC = require("./modules/RTC/RTC");
+var Statistics = require("./modules/statistics/statistics");
 
 /**
  * Namespace for the interface of Jitsi Meet Library.
@@ -42,11 +43,29 @@ var LibJitsiMeet = {
      * will be returned trough the Promise, otherwise JitsiTrack objects will be returned.
      * @param {string} options.cameraDeviceId
      * @param {string} options.micDeviceId
-     * @returns {Promise.<{Array.<JitsiTrack>}, JitsiConferenceError>} A promise that returns an array of created JitsiTracks if resolved,
+     * @returns {Promise.<{Array.<JitsiTrack>}, JitsiConferenceError>}
+     *     A promise that returns an array of created JitsiTracks if resolved,
      *     or a JitsiConferenceError if rejected.
      */
     createLocalTracks: function (options) {
-        return RTC.obtainAudioAndVideoPermissions(options || {});
+        return RTC.obtainAudioAndVideoPermissions(options || {}).then(
+            function(tracks) {
+                if(!RTC.options.disableAudioLevels)
+                    for(var i = 0; i < tracks.length; i++) {
+                        var track = tracks[i];
+                        var mStream = track.getOriginalStream();
+                        if(track.getType() === "audio"){
+                            Statistics.startLocalStats(mStream,
+                                track.setAudioLevel.bind(track));
+                            track.addEventListener(
+                                JitsiTrackEvents.TRACK_STOPPED,
+                                function(){
+                                    Statistics.stopLocalStats(mStream);
+                                });
+                        }
+                    }
+                return tracks;
+            });
     },
     isDeviceListAvailable: function () {
         return RTC.isDeviceListAvailable();
diff --git a/JitsiTrackErrors.js b/JitsiTrackErrors.js
index 3a7cc3a66..9239bc6be 100644
--- a/JitsiTrackErrors.js
+++ b/JitsiTrackErrors.js
@@ -1,6 +1,7 @@
 module.exports = {
     /**
-     * Returns JitsiTrackErrors based on the error object passed by GUM * @param error the error
+     * Returns JitsiTrackErrors based on the error object passed by GUM
+     * @param error the error
      * @param {Object} options the options object given to GUM.
      */
     parseError: function (error, options) {
diff --git a/JitsiTrackEvents.js b/JitsiTrackEvents.js
index b7b229efe..cace3e680 100644
--- a/JitsiTrackEvents.js
+++ b/JitsiTrackEvents.js
@@ -10,7 +10,7 @@ var JitsiTrackEvents = {
     /**
      * The media track was removed to the conference.
      */
-    TRACK_STOPPED: "track.TRACK_STOPPED",
+    TRACK_STOPPED: "track.stopped"
 };
 
 module.exports = JitsiTrackEvents;
diff --git a/doc/example/example.js b/doc/example/example.js
index 6a775bfc7..9f91d4a02 100644
--- a/doc/example/example.js
+++ b/doc/example/example.js
@@ -9,8 +9,7 @@ var options = {
 }
 
 var confOptions = {
-    openSctp: true,
-    disableAudioLevels: true
+    openSctp: true
 }
 
 /**
@@ -22,6 +21,18 @@ function onLocalTracks(tracks)
     localTracks = tracks;
     for(var i = 0; i < localTracks.length; i++)
     {
+        localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_LEVEL_CHANGED,
+            function (audioLevel) {
+                console.debug("Audio Level local: " + audioLevel);
+            });
+        localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_MUTE_CHANGED,
+            function () {
+                console.debug("local track muted");
+            });
+        localTracks[i].addEventListener(JitsiMeetJS.events.track.TRACK_STOPPED,
+            function () {
+                console.debug("local track stoped");
+            });
         if(localTracks[i].getType() == "video") {
             $("body").append("<video autoplay='1' id='localVideo" + i + "' />");
             localTracks[i].attach($("#localVideo" + i ));
@@ -29,7 +40,6 @@ function onLocalTracks(tracks)
             $("body").append("<audio autoplay='1' id='localAudio" + i + "' />");
             localTracks[i].attach($("#localAudio" + i ));
         }
-        console.log(localTracks[i]);
     }
 }
 
@@ -38,10 +48,24 @@ function onLocalTracks(tracks)
  * @param track JitsiTrack object
  */
 function onRemoteTrack(track) {
+    if(track.isLocal())
+        return;
     var participant = track.getParitcipantId();
     if(!remoteTracks[participant])
         remoteTracks[participant] = [];
     var idx = remoteTracks[participant].push(track);
+    track.addEventListener(JitsiMeetJS.events.track.TRACK_AUDIO_LEVEL_CHANGED,
+        function (audioLevel) {
+            console.debug("Audio Level remote: " + audioLevel);
+        });
+    track.addEventListener(JitsiMeetJS.events.track.TRACK_MUTE_CHANGED,
+        function () {
+            console.debug("remote track muted");
+        });
+    track.addEventListener(JitsiMeetJS.events.track.TRACK_STOPPED,
+        function () {
+            console.debug("remote track stoped");
+        });
     var id = participant + track.getType() + idx;
     if(track.getType() == "video") {
         $("body").append("<video autoplay='1' id='" + participant + "video" + idx + "' />");
@@ -74,8 +98,8 @@ function onUserLeft(id) {
 function onConnectionSuccess(){
     room = connection.initJitsiConference("conference2", confOptions);
     room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
-    room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, function () {
-        console.debug("track removed!!!");
+    room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, function (track) {
+        console.debug("track removed!!!" + track);
     });
     room.on(JitsiMeetJS.events.conference.CONFERENCE_JOINED, onConferenceJoined);
     room.on(JitsiMeetJS.events.conference.USER_JOINED, function(id){ remoteTracks[id] = [];});
@@ -88,7 +112,7 @@ function onConnectionSuccess(){
     });
     room.on(JitsiMeetJS.events.conference.TRACK_AUDIO_LEVEL_CHANGED,
       function(userID, audioLevel){
-          // console.log(userID + " - " + audioLevel);
+          console.log(userID + " - " + audioLevel);
       });
     room.join();
 };
@@ -120,6 +144,7 @@ $(window).bind('unload', unload);
 
 // JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.ERROR);
 var initOptions = {
+    // disableAudioLevels: true,
     // Desktop sharing method. Can be set to 'ext', 'webrtc' or false to disable.
     desktopSharingChromeMethod: 'ext',
     // The ID of the jidesha extension for Chrome.
diff --git a/lib-jitsi-meet.js b/lib-jitsi-meet.js
index 8e195034b..35a2ab998 100644
--- a/lib-jitsi-meet.js
+++ b/lib-jitsi-meet.js
@@ -4,12 +4,12 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTC = require("./modules/RTC/RTC");
 var XMPPEvents = require("./service/xmpp/XMPPEvents");
-var StreamEventTypes = require("./service/RTC/StreamEventTypes");
 var RTCEvents = require("./service/RTC/RTCEvents");
 var EventEmitter = require("events");
 var JitsiConferenceEvents = require("./JitsiConferenceEvents");
 var JitsiParticipant = require("./JitsiParticipant");
 var Statistics = require("./modules/statistics/statistics");
+var JitsiTrackEvents = require("./JitsiTrackEvents");
 
 /**
  * Creates a JitsiConference object with the given name and properties.
@@ -34,7 +34,7 @@ function JitsiConference(options) {
     this.room = this.xmpp.createRoom(this.options.name, null, null, this.options.config);
     this.room.updateDeviceAvailability(RTC.getDeviceAvailability());
     this.rtc = new RTC(this.room, options);
-    if(!options.config.disableAudioLevels)
+    if(!RTC.options.disableAudioLevels)
         this.statistics = new Statistics();
     setupListeners(this);
     this.participants = {};
@@ -90,15 +90,16 @@ JitsiConference.prototype.on = function (eventId, handler) {
  */
 JitsiConference.prototype.off = function (eventId, handler) {
     if(this.eventEmitter)
-        this.eventEmitter.removeListener(eventId, listener);
+        this.eventEmitter.removeListener(eventId, handler);
 }
 
 // Common aliases for event emitter
-JitsiConference.prototype.addEventListener = JitsiConference.prototype.on
-JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off
+JitsiConference.prototype.addEventListener = JitsiConference.prototype.on;
+JitsiConference.prototype.removeEventListener = JitsiConference.prototype.off;
 
 /**
- * Receives notifications from another participants for commands / custom events(send by sendPresenceCommand method).
+ * Receives notifications from another participants for commands / custom events
+ * (send by sendPresenceCommand method).
  * @param command {String} the name of the command
  * @param handler {Function} handler for the command
  */
@@ -174,17 +175,55 @@ JitsiConference.prototype.setDisplayName = function(name) {
  * @param track the JitsiLocalTrack object.
  */
 JitsiConference.prototype.addTrack = function (track) {
-    this.rtc.addLocalStream(track);
-    this.room.addStream(track.getOriginalStream(), function () {});
+    this.room.addStream(track.getOriginalStream(), function () {
+        this.rtc.addLocalStream(track);
+        var muteHandler = this._fireMuteChangeEvent.bind(this, track);
+        var stopHandler = this.removeTrack.bind(this, track);
+        var audioLevelHandler = this._fireAudioLevelChangeEvent.bind(this);
+        track.addEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED, muteHandler);
+        track.addEventListener(JitsiTrackEvents.TRACK_STOPPED, stopHandler);
+        track.addEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+            audioLevelHandler);
+        this.addEventListener(JitsiConferenceEvents.TRACK_REMOVED, function (track) {
+            track.removeEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
+                muteHandler);
+            track.removeEventListener(JitsiTrackEvents.TRACK_STOPPED,
+                stopHandler);
+            track.removeEventListener(
+                JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED, audioLevelHandler);
+        })
+        this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
+    }.bind(this));
+
 }
 
+/**
+ * Fires TRACK_AUDIO_LEVEL_CHANGED change conference event.
+ * @param audioLevel the audio level
+ */
+JitsiConference.prototype._fireAudioLevelChangeEvent = function (audioLevel) {
+    this.eventEmitter.emit(
+        JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
+        this.myUserId(), audioLevel);
+}
+
+/**
+ * Fires TRACK_MUTE_CHANGED change conference event.
+ * @param track the JitsiTrack object related to the event.
+ */
+JitsiConference.prototype._fireMuteChangeEvent = function (track) {
+    this.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
+};
+
 /**
  * Removes JitsiLocalTrack object to the conference.
  * @param track the JitsiLocalTrack object.
  */
 JitsiConference.prototype.removeTrack = function (track) {
-    this.room.removeStream(track.getOriginalStream());
-    this.rtc.removeLocalStream(track);
+    this.room.removeStream(track.getOriginalStream(), function(){
+        this.rtc.removeLocalStream(track);
+        this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+    }.bind(this));
 }
 
 /**
@@ -249,8 +288,33 @@ function setupListeners(conference) {
         if(conference.statistics)
             conference.statistics.startRemoteStats(event.peerconnection);
     });
+
     conference.room.addListener(XMPPEvents.REMOTE_STREAM_RECEIVED,
-        conference.rtc.createRemoteStream.bind(conference.rtc));
+        function (data, sid, thessrc) {
+            var track = conference.rtc.createRemoteStream(data, sid, thessrc);
+            if(!track)
+                return;
+            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED,
+                track);
+            track.addEventListener(JitsiTrackEvents.TRACK_STOPPED,
+                function () {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_REMOVED, track);
+                });
+            track.addEventListener(JitsiTrackEvents.TRACK_MUTE_CHANGED,
+                function () {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
+                });
+            var userId = track.getParitcipantId();
+            track.addEventListener(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                function (audioLevel) {
+                    conference.eventEmitter.emit(
+                        JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                        userId, audioLevel);
+                });
+        }
+    );
 
     conference.room.addListener(XMPPEvents.MUC_JOINED, function () {
         conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_JOINED);
@@ -287,25 +351,6 @@ function setupListeners(conference) {
         conference.eventEmitter.emit(JitsiConferenceEvents.SETUP_FAILED);
     });
 
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED,
-        function (stream) {
-            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, stream);
-        });
-
-//FIXME: Maybe remove event should not be associated with the conference.
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, function (stream) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
-    });
-//FIXME: Maybe remove event should not be associated with the conference.
-    conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, function (stream) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream);
-        conference.removeTrack(stream);
-    });
-
-    conference.rtc.addListener(StreamEventTypes.TRACK_MUTE_CHANGED, function (track) {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track);
-    });
-
     conference.rtc.addListener(RTCEvents.DOMINANTSPEAKER_CHANGED, function (id) {
         if(conference.lastActiveSpeaker !== id && conference.room) {
             conference.lastActiveSpeaker = id;
@@ -327,20 +372,11 @@ function setupListeners(conference) {
         //FIXME: Maybe remove event should not be associated with the conference.
         conference.statistics.addAudioLevelListener(function (ssrc, level) {
             var userId = null;
-            if (ssrc === Statistics.LOCAL_JID) {
-                userId = conference.myUserId();
-            } else {
-                var jid = conference.room.getJidBySSRC(ssrc);
-                if (!jid)
-                    return;
+            var jid = conference.room.getJidBySSRC(ssrc);
+            if (!jid)
+                return;
 
-                userId = Strophe.getResourceFromJid(jid);
-            }
-            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
-                userId, level);
-        });
-        conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_CREATED, function (stream) {
-            conference.statistics.startLocalStats(stream);
+            conference.rtc.setAudioLevel(jid, level);
         });
         conference.xmpp.addListener(XMPPEvents.DISPOSE_CONFERENCE,
             function () {
@@ -357,7 +393,7 @@ function setupListeners(conference) {
 module.exports = JitsiConference;
 
 }).call(this,"/JitsiConference.js")
-},{"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./modules/RTC/RTC":15,"./modules/statistics/statistics":23,"./service/RTC/RTCEvents":82,"./service/RTC/StreamEventTypes":84,"./service/xmpp/XMPPEvents":89,"events":42,"jitsi-meet-logger":46}],2:[function(require,module,exports){
+},{"./JitsiConferenceEvents":3,"./JitsiParticipant":8,"./JitsiTrackEvents":10,"./modules/RTC/RTC":15,"./modules/statistics/statistics":23,"./service/RTC/RTCEvents":82,"./service/xmpp/XMPPEvents":88,"events":42,"jitsi-meet-logger":46}],2:[function(require,module,exports){
 /**
  * Enumeration with the errors for the conference.
  * @type {{string: string}}
@@ -627,6 +663,7 @@ var JitsiTrackEvents = require("./JitsiTrackEvents");
 var JitsiTrackErrors = require("./JitsiTrackErrors");
 var Logger = require("jitsi-meet-logger");
 var RTC = require("./modules/RTC/RTC");
+var Statistics = require("./modules/statistics/statistics");
 
 /**
  * Namespace for the interface of Jitsi Meet Library.
@@ -662,11 +699,29 @@ var LibJitsiMeet = {
      * will be returned trough the Promise, otherwise JitsiTrack objects will be returned.
      * @param {string} options.cameraDeviceId
      * @param {string} options.micDeviceId
-     * @returns {Promise.<{Array.<JitsiTrack>}, JitsiConferenceError>} A promise that returns an array of created JitsiTracks if resolved,
+     * @returns {Promise.<{Array.<JitsiTrack>}, JitsiConferenceError>}
+     *     A promise that returns an array of created JitsiTracks if resolved,
      *     or a JitsiConferenceError if rejected.
      */
     createLocalTracks: function (options) {
-        return RTC.obtainAudioAndVideoPermissions(options || {});
+        return RTC.obtainAudioAndVideoPermissions(options || {}).then(
+            function(tracks) {
+                if(!RTC.options.disableAudioLevels)
+                    for(var i = 0; i < tracks.length; i++) {
+                        var track = tracks[i];
+                        var mStream = track.getOriginalStream();
+                        if(track.getType() === "audio"){
+                            Statistics.startLocalStats(mStream,
+                                track.setAudioLevel.bind(track));
+                            track.addEventListener(
+                                JitsiTrackEvents.TRACK_STOPPED,
+                                function(){
+                                    Statistics.stopLocalStats(mStream);
+                                });
+                        }
+                    }
+                return tracks;
+            });
     },
     isDeviceListAvailable: function () {
         return RTC.isDeviceListAvailable();
@@ -682,7 +737,7 @@ window.Promise = window.Promise || require("es6-promise").Promise;
 
 module.exports = LibJitsiMeet;
 
-},{"./JitsiConferenceErrors":2,"./JitsiConferenceEvents":3,"./JitsiConnection":4,"./JitsiConnectionErrors":5,"./JitsiConnectionEvents":6,"./JitsiTrackErrors":9,"./JitsiTrackEvents":10,"./modules/RTC/RTC":15,"es6-promise":44,"jitsi-meet-logger":46}],8:[function(require,module,exports){
+},{"./JitsiConferenceErrors":2,"./JitsiConferenceEvents":3,"./JitsiConnection":4,"./JitsiConnectionErrors":5,"./JitsiConnectionEvents":6,"./JitsiTrackErrors":9,"./JitsiTrackEvents":10,"./modules/RTC/RTC":15,"./modules/statistics/statistics":23,"es6-promise":44,"jitsi-meet-logger":46}],8:[function(require,module,exports){
 /**
  * Represents a participant in (a member of) a conference.
  */
@@ -823,7 +878,8 @@ module.exports = JitsiParticipant();
 },{}],9:[function(require,module,exports){
 module.exports = {
     /**
-     * Returns JitsiTrackErrors based on the error object passed by GUM * @param error the error
+     * Returns JitsiTrackErrors based on the error object passed by GUM
+     * @param error the error
      * @param {Object} options the options object given to GUM.
      */
     parseError: function (error, options) {
@@ -858,7 +914,7 @@ var JitsiTrackEvents = {
     /**
      * The media track was removed to the conference.
      */
-    TRACK_STOPPED: "track.TRACK_STOPPED",
+    TRACK_STOPPED: "track.stopped"
 };
 
 module.exports = JitsiTrackEvents;
@@ -1081,8 +1137,8 @@ module.exports = DataChannels;
 }).call(this,"/modules/RTC/DataChannels.js")
 },{"../../service/RTC/RTCEvents":82,"jitsi-meet-logger":46}],12:[function(require,module,exports){
 var JitsiTrack = require("./JitsiTrack");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var RTCBrowserType = require("./RTCBrowserType");
+var JitsiTrackEvents = require('../../JitsiTrackEvents');
 var RTC = require("./RTCUtils");
 
 /**
@@ -1095,14 +1151,15 @@ function JitsiLocalTrack(stream, videoType,
     this.videoType = videoType;
     this.dontFireRemoveEvent = false;
     this.resolution = resolution;
+    this.startMuted = false;
     var self = this;
     JitsiTrack.call(this, null, stream,
         function () {
-            if(!self.dontFireRemoveEvent && self.rtc)
-                self.rtc.eventEmitter.emit(
-                    StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, self);
-            self.dontFireRemoveEvent = false;
-        });
+            if(!this.dontFireRemoveEvent)
+                this.eventEmitter.emit(
+                    JitsiTrackEvents.TRACK_STOPPED);
+            this.dontFireRemoveEvent = false;
+        }.bind(this));
 
 }
 
@@ -1115,14 +1172,14 @@ JitsiLocalTrack.prototype.constructor = JitsiLocalTrack;
  */
 JitsiLocalTrack.prototype._setMute = function (mute) {
     if(!this.rtc) {
-        console.error("Mute is not supported for streams not attached to conference!");
+        this.startMuted = mute;
         return;
     }
     var isAudio = this.type === JitsiTrack.AUDIO;
     this.dontFireRemoveEvent = false;
 
     if ((window.location.protocol != "https:") ||
-        (isAudio) || this.videoType === "screen" ||
+        (isAudio) || this.videoType === "desktop" ||
         // FIXME FF does not support 'removeStream' method used to mute
         RTCBrowserType.isFirefox()) {
 
@@ -1134,7 +1191,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
             this.rtc.room.setAudioMute(mute);
         else
             this.rtc.room.setVideoMute(mute);
-        this.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+        this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
     } else {
         if (mute) {
             this.dontFireRemoveEvent = true;
@@ -1145,7 +1202,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
             else
                 this.rtc.room.setVideoMute(mute);
             this.stream = null;
-            this.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+            this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
             //FIXME: Maybe here we should set the SRC for the containers to something
         } else {
             var self = this;
@@ -1177,7 +1234,8 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
                                 self.rtc.room.setAudioMute(mute);
                             else
                                 self.rtc.room.setVideoMute(mute);
-                            self.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, self);
+                            self.eventEmitter.emit(
+                                JitsiTrackEvents.TRACK_MUTE_CHANGED);
                         });
                 });
         }
@@ -1193,7 +1251,7 @@ JitsiLocalTrack.prototype.stop = function () {
         return;
     if(this.rtc)
         this.rtc.room.removeStream(this.stream);
-    this.rtc.stopMediaStream(this.stream);
+    RTC.stopMediaStream(this.stream);
     this.detach();
 }
 
@@ -1230,11 +1288,18 @@ JitsiLocalTrack.prototype._setRTC = function (rtc) {
     this.rtc = rtc;
 };
 
+/**
+ * Return true;
+ */
+JitsiLocalTrack.prototype.isLocal = function () {
+    return true;
+}
+
 module.exports = JitsiLocalTrack;
 
-},{"../../service/RTC/StreamEventTypes":84,"./JitsiTrack":14,"./RTCBrowserType":16,"./RTCUtils":17}],13:[function(require,module,exports){
+},{"../../JitsiTrackEvents":10,"./JitsiTrack":14,"./RTCBrowserType":16,"./RTCUtils":17}],13:[function(require,module,exports){
 var JitsiTrack = require("./JitsiTrack");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
+var JitsiTrackEvents = require("../../JitsiTrackEvents");
 
 /**
  * Represents a single media track (either audio or video).
@@ -1245,11 +1310,11 @@ var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
  * @param eventEmitter the event emitter
  * @constructor
  */
-function JitsiRemoteTrack(RTC, data, sid, ssrc, eventEmitter) {
+function JitsiRemoteTrack(RTC, data, sid, ssrc) {
     JitsiTrack.call(this, RTC, data.stream,
         function () {
-            eventEmitter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, self);
-        });
+            this.eventEmitter.emit(JitsiTrackEvents.TRACK_STOPPED);
+        }.bind(this));
     this.rtc = RTC;
     this.sid = sid;
     this.stream = data.stream;
@@ -1259,10 +1324,8 @@ function JitsiRemoteTrack(RTC, data, sid, ssrc, eventEmitter) {
     this.muted = false;
     if((this.type === JitsiTrack.AUDIO && data.audiomuted)
       || (this.type === JitsiTrack.VIDEO && data.videomuted)) {
-        this.muted = true
+        this.muted = true;
     }
-    this.eventEmitter = eventEmitter;
-    var self = this;
 }
 
 JitsiRemoteTrack.prototype = Object.create(JitsiTrack.prototype);
@@ -1275,7 +1338,7 @@ JitsiRemoteTrack.prototype.constructor = JitsiRemoteTrack;
 JitsiRemoteTrack.prototype.setMute = function (value) {
     this.stream.muted = value;
     this.muted = value;
-    this.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+    this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
 };
 
 /**
@@ -1294,14 +1357,23 @@ JitsiRemoteTrack.prototype.getParitcipantId = function() {
     return Strophe.getResourceFromJid(this.peerjid);
 };
 
+/**
+ * Return false;
+ */
+JitsiRemoteTrack.prototype.isLocal = function () {
+    return false;
+}
+
 delete JitsiRemoteTrack.prototype.stop;
 
 delete JitsiRemoteTrack.prototype.start;
 
 module.exports = JitsiRemoteTrack;
 
-},{"../../service/RTC/StreamEventTypes":84,"./JitsiTrack":14}],14:[function(require,module,exports){
+},{"../../JitsiTrackEvents":10,"./JitsiTrack":14}],14:[function(require,module,exports){
 var RTCBrowserType = require("./RTCBrowserType");
+var JitsiTrackEvents = require("../../JitsiTrackEvents");
+var EventEmitter = require("events");
 
 /**
  * This implements 'onended' callback normally fired by WebRTC after the stream
@@ -1357,6 +1429,8 @@ function JitsiTrack(rtc, stream, streamInactiveHandler)
     this.containers = [];
     this.rtc = rtc;
     this.stream = stream;
+    this.eventEmitter = new EventEmitter();
+    this.audioLevel = -1;
     this.type = (this.stream.getVideoTracks().length > 0)?
         JitsiTrack.VIDEO : JitsiTrack.AUDIO;
     if(this.type == "audio") {
@@ -1487,10 +1561,47 @@ JitsiTrack.prototype.isActive = function () {
         return true;
 };
 
+/**
+ * Attaches a handler for events(For example - "audio level changed".).
+ * All possible event are defined in JitsiTrackEvents.
+ * @param eventId the event ID.
+ * @param handler handler for the event.
+ */
+JitsiTrack.prototype.on = function (eventId, handler) {
+    if(this.eventEmitter)
+        this.eventEmitter.on(eventId, handler);
+}
+
+/**
+ * Removes event listener
+ * @param eventId the event ID.
+ * @param [handler] optional, the specific handler to unbind
+ */
+JitsiTrack.prototype.off = function (eventId, handler) {
+    if(this.eventEmitter)
+        this.eventEmitter.removeListener(eventId, handler);
+}
+
+// Common aliases for event emitter
+JitsiTrack.prototype.addEventListener = JitsiTrack.prototype.on;
+JitsiTrack.prototype.removeEventListener = JitsiTrack.prototype.off;
+
+
+/**
+ * Sets the audio level for the stream
+ * @param audioLevel the new audio level
+ */
+JitsiTrack.prototype.setAudioLevel = function (audioLevel) {
+    if(this.audioLevel !== audioLevel) {
+        this.eventEmitter.emit(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+            audioLevel);
+        this.audioLevel = audioLevel;
+    }
+ }
 
 module.exports = JitsiTrack;
 
-},{"./RTCBrowserType":16,"./RTCUtils":17}],15:[function(require,module,exports){
+},{"../../JitsiTrackEvents":10,"./RTCBrowserType":16,"./RTCUtils":17,"events":42}],15:[function(require,module,exports){
 /* global APP */
 var EventEmitter = require("events");
 var RTCBrowserType = require("./RTCBrowserType");
@@ -1502,7 +1613,6 @@ var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
 var DesktopSharingEventTypes
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
 var RTCEvents = require("../../service/RTC/RTCEvents.js");
 
 function createLocalTracks(streams) {
@@ -1513,10 +1623,6 @@ function createLocalTracks(streams) {
         newStreams.push(localStream);
         if (streams[i].isMuted === true)
             localStream.setMute(true);
-        //FIXME:
-        // var eventType = StreamEventTypes.EVENT_TYPE_LOCAL_CREATED;
-        //
-        // eventEmitter.emit(eventType, localStream);
     }
     return newStreams;
 }
@@ -1524,6 +1630,8 @@ function createLocalTracks(streams) {
 function RTC(room, options) {
     this.room = room;
     this.localStreams = [];
+    //FIXME: we should start removing those streams.
+    //FIXME: We should support multiple streams per jid.
     this.remoteStreams = {};
     this.localAudio = null;
     this.localVideo = null;
@@ -1531,12 +1639,14 @@ function RTC(room, options) {
     var self = this;
     this.options = options || {};
     room.addPresenceListener("videomuted", function (values, from) {
-        if(self.remoteStreams[from])
+        if(self.remoteStreams[from]) {
             self.remoteStreams[from][JitsiTrack.VIDEO].setMute(values.value == "true");
+        }
     });
     room.addPresenceListener("audiomuted", function (values, from) {
-        if(self.remoteStreams[from])
+        if(self.remoteStreams[from]) {
             self.remoteStreams[from][JitsiTrack.AUDIO].setMute(values.value == "true");
+        }
     });
 }
 
@@ -1597,7 +1707,8 @@ RTC.isRTCReady = function () {
 }
 
 RTC.init = function (options) {
-    return RTCUtils.init(options || {});
+    this.options = options || {};
+    return RTCUtils.init(this.options);
 }
 
 RTC.getDeviceAvailability = function () {
@@ -1625,8 +1736,7 @@ RTC.prototype.removeLocalStream = function (stream) {
 };
 
 RTC.prototype.createRemoteStream = function (data, sid, thessrc) {
-    var remoteStream = new JitsiRemoteTrack(this, data, sid, thessrc,
-        this.eventEmitter);
+    var remoteStream = new JitsiRemoteTrack(this, data, sid, thessrc);
     if(!data.peerjid)
         return;
     var jid = data.peerjid;
@@ -1634,7 +1744,6 @@ RTC.prototype.createRemoteStream = function (data, sid, thessrc) {
         this.remoteStreams[jid] = {};
     }
     this.remoteStreams[jid][remoteStream.type]= remoteStream;
-    this.eventEmitter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, remoteStream);
     return remoteStream;
 };
 
@@ -1686,24 +1795,6 @@ RTC.prototype.getVideoElementName = function () {
 RTC.prototype.dispose = function() {
 };
 
-RTC.prototype.muteRemoteVideoStream = function (jid, value) {
-    var stream;
-
-    if(this.remoteStreams[jid] &&
-        this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE]) {
-        stream = this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE];
-    }
-
-    if(!stream)
-        return true;
-
-    if (value != stream.muted) {
-        stream.setMute(value);
-        return true;
-    }
-    return false;
-};
-
 RTC.prototype.switchVideoStreams = function (newStream) {
     this.localVideo.stream = newStream;
 
@@ -1715,42 +1806,13 @@ RTC.prototype.switchVideoStreams = function (newStream) {
     this.localStreams.push(this.localVideo);
 };
 
-RTC.prototype.isVideoMuted = function (jid) {
-    if (jid === APP.xmpp.myJid()) {
-        var localVideo = APP.RTC.localVideo;
-        return (!localVideo || localVideo.isMuted());
-    } else {
-        if (!this.remoteStreams[jid] ||
-            !this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE]) {
-            return null;
-        }
-        return this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE].muted;
-    }
-};
-
-RTC.prototype.setVideoMute = function (mute, callback, options) {
-    if (!this.localVideo)
-        return;
-
-    if (mute == this.localVideo.isMuted())
-    {
-        APP.xmpp.sendVideoInfoPresence(mute);
-        if (callback)
-            callback(mute);
-    }
-    else
-    {
-        this.localVideo.setMute(mute);
-        this.room.setVideoMute(
-            mute,
-            callback,
-            options);
-    }
-};
-
+RTC.prototype.setAudioLevel = function (jid, audioLevel) {
+    if(this.remoteStreams[jid] && this.remoteStreams[jid][JitsiTrack.AUDIO])
+        this.remoteStreams[jid][JitsiTrack.AUDIO].setAudioLevel(audioLevel);
+}
 module.exports = RTC;
 
-},{"../../service/RTC/MediaStreamTypes":81,"../../service/RTC/RTCEvents.js":82,"../../service/RTC/StreamEventTypes.js":84,"../../service/desktopsharing/DesktopSharingEventTypes":86,"./DataChannels":11,"./JitsiLocalTrack.js":12,"./JitsiRemoteTrack.js":13,"./JitsiTrack":14,"./RTCBrowserType":16,"./RTCUtils.js":17,"events":42}],16:[function(require,module,exports){
+},{"../../service/RTC/MediaStreamTypes":81,"../../service/RTC/RTCEvents.js":82,"../../service/desktopsharing/DesktopSharingEventTypes":85,"./DataChannels":11,"./JitsiLocalTrack.js":12,"./JitsiRemoteTrack.js":13,"./JitsiTrack":14,"./RTCBrowserType":16,"./RTCUtils.js":17,"events":42}],16:[function(require,module,exports){
 
 var currentBrowser;
 
@@ -3094,7 +3156,7 @@ function initFirefoxExtensionDetection(options) {
 module.exports = ScreenObtainer;
 
 }).call(this,"/modules/RTC/ScreenObtainer.js")
-},{"../../service/desktopsharing/DesktopSharingEventTypes":86,"./RTCBrowserType":16,"./adapter.screenshare":19,"jitsi-meet-logger":46}],19:[function(require,module,exports){
+},{"../../service/desktopsharing/DesktopSharingEventTypes":85,"./RTCBrowserType":16,"./adapter.screenshare":19,"jitsi-meet-logger":46}],19:[function(require,module,exports){
 (function (__filename){
 /*! adapterjs - v0.12.0 - 2015-09-04 */
 var console = require("jitsi-meet-logger").getLogger(__filename);
@@ -4360,9 +4422,6 @@ module.exports = Settings;
  */
 
 var RTCBrowserType = require('../RTC/RTCBrowserType');
-var StatisticsEvents = require('../../service/statistics/Events');
-
-var LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID;
 
 /**
  * Size of the webaudio analyzer buffer.
@@ -4423,16 +4482,16 @@ function animateLevel(newLevel, lastLevel) {
  *
  * @param stream the local stream
  * @param interval stats refresh interval given in ms.
+ * @param callback function that receives the audio levels.
  * @constructor
  */
-function LocalStatsCollector(stream, interval, statisticsService, eventEmitter) {
+function LocalStatsCollector(stream, interval, callback) {
     window.AudioContext = window.AudioContext || window.webkitAudioContext;
     this.stream = stream;
     this.intervalId = null;
     this.intervalMilis = interval;
-    this.eventEmitter = eventEmitter;
     this.audioLevel = 0;
-    this.statisticsService = statisticsService;
+    this.callback = callback;
 }
 
 /**
@@ -4462,10 +4521,7 @@ LocalStatsCollector.prototype.start = function () {
             var audioLevel = timeDomainDataToAudioLevel(array);
             if (audioLevel != self.audioLevel) {
                 self.audioLevel = animateLevel(audioLevel, self.audioLevel);
-                self.eventEmitter.emit(
-                    StatisticsEvents.AUDIO_LEVEL,
-                    self.statisticsService.LOCAL_JID,
-                    self.audioLevel);
+                self.callback(self.audioLevel);
             }
         },
         this.intervalMilis
@@ -4483,7 +4539,8 @@ LocalStatsCollector.prototype.stop = function () {
 };
 
 module.exports = LocalStatsCollector;
-},{"../../service/statistics/Events":87,"../../service/statistics/constants":88,"../RTC/RTCBrowserType":16}],22:[function(require,module,exports){
+
+},{"../RTC/RTCBrowserType":16}],22:[function(require,module,exports){
 (function (__filename){
 /* global require, ssrc2jid */
 /* jshint -W117 */
@@ -5210,7 +5267,7 @@ StatsCollector.prototype.processAudioLevelReport = function () {
 };
 
 }).call(this,"/modules/statistics/RTPStatsCollector.js")
-},{"../../service/statistics/Events":87,"../RTC/RTCBrowserType":16,"jitsi-meet-logger":46}],23:[function(require,module,exports){
+},{"../../service/statistics/Events":86,"../RTC/RTCBrowserType":16,"jitsi-meet-logger":46}],23:[function(require,module,exports){
 /* global require, APP */
 var LocalStats = require("./LocalStatsCollector.js");
 var RTPStats = require("./RTPStatsCollector.js");
@@ -5231,8 +5288,9 @@ var StatisticsEvents = require("../../service/statistics/Events");
 //    }
 //}
 
+var eventEmitter = new EventEmitter();
+
 function Statistics() {
-    this.localStats = null;
     this.rtpStats = null;
     this.eventEmitter = new EventEmitter();
 }
@@ -5246,14 +5304,13 @@ Statistics.prototype.startRemoteStats = function (peerconnection) {
     this.rtpStats.start();
 }
 
-Statistics.prototype.startLocalStats = function (stream) {
-    if(stream.getType() !== "audio")
-        return;
-    this.localStats = new LocalStats(stream.getOriginalStream(), 200, this,
-        this.eventEmitter);
-    this.localStats.start();
-}
+Statistics.localStats = [];
 
+Statistics.startLocalStats = function (stream, callback) {
+    var localStats = new LocalStats(stream, 200, callback);
+    this.localStats.push(localStats);
+    localStats.start();
+}
 
 Statistics.prototype.addAudioLevelListener = function(listener)
 {
@@ -5266,20 +5323,29 @@ Statistics.prototype.removeAudioLevelListener = function(listener)
 }
 
 Statistics.prototype.dispose = function () {
-    this.stopLocal();
+    Statistics.stopAllLocalStats();
     this.stopRemote();
     if(this.eventEmitter)
-    {
         this.eventEmitter.removeAllListeners();
-    }
+
+    if(eventEmitter)
+        eventEmitter.removeAllListeners();
 }
 
 
-Statistics.prototype.stopLocal = function () {
-    if (this.localStats) {
-        this.localStats.stop();
-        this.localStats = null;
-    }
+Statistics.stopAllLocalStats = function () {
+    for(var i = 0; i < this.localStats.length; i++)
+        this.localStats[i].stop();
+    this.localStats = [];
+}
+
+Statistics.stopLocalStats = function (stream) {
+    for(var i = 0; i < Statistics.localStats.length; i++)
+        if(Statistics.localStats[i].stream === stream){
+            var localStats = Statistics.localStats.splice(i, 1);
+            localStats.stop();
+            break;
+        }
 }
 
 Statistics.prototype.stopRemote = function () {
@@ -5358,7 +5424,8 @@ Statistics.LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID;
 
 
 module.exports = Statistics;
-},{"../../service/statistics/Events":87,"../../service/statistics/constants":88,"./LocalStatsCollector.js":21,"./RTPStatsCollector.js":22,"events":42}],24:[function(require,module,exports){
+
+},{"../../service/statistics/Events":86,"../../service/statistics/constants":87,"./LocalStatsCollector.js":21,"./RTPStatsCollector.js":22,"events":42}],24:[function(require,module,exports){
 /**
 /**
  * @const
@@ -5952,10 +6019,10 @@ ChatRoom.prototype.setJingleSession = function(session){
 };
 
 
-ChatRoom.prototype.removeStream = function (stream) {
+ChatRoom.prototype.removeStream = function (stream, callback) {
     if(!this.session)
         return;
-    this.session.peerconnection.removeStream(stream)
+    this.session.removeStream(stream, callback);
 }
 
 ChatRoom.prototype.switchStreams = function (stream, oldStream, callback, isAudio) {
@@ -6079,7 +6146,7 @@ ChatRoom.prototype.getJidBySSRC = function (ssrc) {
 module.exports = ChatRoom;
 
 }).call(this,"/modules/xmpp/ChatRoom.js")
-},{"../../service/xmpp/XMPPEvents":89,"./moderator":33,"events":42,"jitsi-meet-logger":46}],26:[function(require,module,exports){
+},{"../../service/xmpp/XMPPEvents":88,"./moderator":33,"events":42,"jitsi-meet-logger":46}],26:[function(require,module,exports){
 (function (__filename){
 /*
  * JingleSession provides an API to manage a single Jingle session. We will
@@ -7454,6 +7521,43 @@ JingleSessionPC.prototype.addStream = function (stream, callback) {
     });
 }
 
+/**
+ * Remove streams.
+ * @param stream stream that will be removed.
+ * @param success_callback callback executed after successful stream addition.
+ */
+JingleSessionPC.prototype.removeStream = function (stream, callback) {
+
+    var self = this;
+
+    // Remember SDP to figure out added/removed SSRCs
+    var oldSdp = null;
+    if(this.peerconnection) {
+        if(this.peerconnection.localDescription) {
+            oldSdp = new SDP(this.peerconnection.localDescription.sdp);
+        }
+        if(stream)
+            this.peerconnection.removeStream(stream);
+    }
+
+    // Conference is not active
+    if(!oldSdp || !this.peerconnection) {
+        callback();
+        return;
+    }
+
+    this.addingStreams = true;
+    this.modifySourcesQueue.push(function() {
+        logger.log('modify sources done');
+
+        callback();
+
+        var newSdp = new SDP(self.peerconnection.localDescription.sdp);
+        logger.log("SDPs", oldSdp, newSdp);
+        self.notifyMySSRCUpdate(oldSdp, newSdp);
+    });
+}
+
 /**
  * Figures out added/removed ssrcs and send update IQs.
  * @param old_sdp SDP object for old description.
@@ -7805,7 +7909,7 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) {
 module.exports = JingleSessionPC;
 
 }).call(this,"/modules/xmpp/JingleSessionPC.js")
-},{"../../service/xmpp/XMPPEvents":89,"../RTC/RTC":15,"../RTC/RTCBrowserType":16,"./JingleSession":26,"./LocalSSRCReplacement":28,"./SDP":29,"./SDPDiffer":30,"./SDPUtil":31,"./TraceablePeerConnection":32,"async":41,"jitsi-meet-logger":46,"sdp-transform":78}],28:[function(require,module,exports){
+},{"../../service/xmpp/XMPPEvents":88,"../RTC/RTC":15,"../RTC/RTCBrowserType":16,"./JingleSession":26,"./LocalSSRCReplacement":28,"./SDP":29,"./SDPDiffer":30,"./SDPUtil":31,"./TraceablePeerConnection":32,"async":41,"jitsi-meet-logger":46,"sdp-transform":78}],28:[function(require,module,exports){
 (function (__filename){
 /* global $ */
 var logger = require("jitsi-meet-logger").getLogger(__filename);
@@ -9742,7 +9846,7 @@ TraceablePeerConnection.prototype.getStats = function(callback, errback) {
 module.exports = TraceablePeerConnection;
 
 }).call(this,"/modules/xmpp/TraceablePeerConnection.js")
-},{"../../service/xmpp/XMPPEvents":89,"../RTC/RTC":15,"../RTC/RTCBrowserType.js":16,"./LocalSSRCReplacement":28,"jitsi-meet-logger":46,"sdp-interop":64,"sdp-simulcast":71,"sdp-transform":78}],33:[function(require,module,exports){
+},{"../../service/xmpp/XMPPEvents":88,"../RTC/RTC":15,"../RTC/RTCBrowserType.js":16,"./LocalSSRCReplacement":28,"jitsi-meet-logger":46,"sdp-interop":64,"sdp-simulcast":71,"sdp-transform":78}],33:[function(require,module,exports){
 (function (__filename){
 /* global $, $iq, APP, config, messageHandler,
  roomName, sessionTerminated, Strophe, Util */
@@ -10179,7 +10283,7 @@ module.exports = Moderator;
 
 
 }).call(this,"/modules/xmpp/moderator.js")
-},{"../../service/authentication/AuthenticationEvents":85,"../../service/xmpp/XMPPEvents":89,"../settings/Settings":20,"jitsi-meet-logger":46}],34:[function(require,module,exports){
+},{"../../service/authentication/AuthenticationEvents":84,"../../service/xmpp/XMPPEvents":88,"../settings/Settings":20,"jitsi-meet-logger":46}],34:[function(require,module,exports){
 (function (__filename){
 /* jshint -W117 */
 /* a simple MUC connection plugin
@@ -10573,7 +10677,7 @@ module.exports = function(XMPP, eventEmitter) {
 
 
 }).call(this,"/modules/xmpp/strophe.jingle.js")
-},{"../../service/xmpp/XMPPEvents":89,"../RTC/RTCBrowserType":16,"./JingleSessionPC":27,"jitsi-meet-logger":46}],36:[function(require,module,exports){
+},{"../../service/xmpp/XMPPEvents":88,"../RTC/RTCBrowserType":16,"./JingleSessionPC":27,"jitsi-meet-logger":46}],36:[function(require,module,exports){
 /* global Strophe */
 module.exports = function () {
 
@@ -10721,7 +10825,7 @@ module.exports = function (XMPP, eventEmitter) {
 };
 
 }).call(this,"/modules/xmpp/strophe.ping.js")
-},{"../../service/xmpp/XMPPEvents":89,"jitsi-meet-logger":46}],38:[function(require,module,exports){
+},{"../../service/xmpp/XMPPEvents":88,"jitsi-meet-logger":46}],38:[function(require,module,exports){
 (function (__filename){
 /* jshint -W117 */
 var logger = require("jitsi-meet-logger").getLogger(__filename);
@@ -10879,7 +10983,6 @@ module.exports = function () {
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var EventEmitter = require("events");
 var Pako = require("pako");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var JitsiConnectionErrors = require("../../JitsiConnectionErrors");
@@ -11000,7 +11103,7 @@ XMPP.prototype._connect = function (jid, password) {
                         logger.warn("Ping NOT supported by " + pingJid);
                 }
             );
-            
+
             if (password)
                 authenticatedUser = true;
             if (self.connection && self.connection.connected &&
@@ -11180,7 +11283,7 @@ XMPP.prototype.disconnect = function () {
 module.exports = XMPP;
 
 }).call(this,"/modules/xmpp/xmpp.js")
-},{"../../JitsiConnectionErrors":5,"../../JitsiConnectionEvents":6,"../../service/RTC/RTCEvents":82,"../../service/RTC/StreamEventTypes":84,"../../service/xmpp/XMPPEvents":89,"../RTC/RTC":15,"./strophe.emuc":34,"./strophe.jingle":35,"./strophe.logger":36,"./strophe.ping":37,"./strophe.rayo":38,"./strophe.util":39,"events":42,"jitsi-meet-logger":46,"pako":47}],41:[function(require,module,exports){
+},{"../../JitsiConnectionErrors":5,"../../JitsiConnectionEvents":6,"../../service/RTC/RTCEvents":82,"../../service/xmpp/XMPPEvents":88,"../RTC/RTC":15,"./strophe.emuc":34,"./strophe.jingle":35,"./strophe.logger":36,"./strophe.ping":37,"./strophe.rayo":38,"./strophe.util":39,"events":42,"jitsi-meet-logger":46,"pako":47}],41:[function(require,module,exports){
 (function (process){
 /*!
  * async
@@ -22285,21 +22388,6 @@ var Resolutions = {
 };
 module.exports = Resolutions;
 },{}],84:[function(require,module,exports){
-var StreamEventTypes = {
-    EVENT_TYPE_LOCAL_CREATED: "stream.local_created",
-
-    EVENT_TYPE_LOCAL_CHANGED: "stream.local_changed",
-
-    EVENT_TYPE_LOCAL_ENDED: "stream.local_ended",
-
-    EVENT_TYPE_REMOTE_CREATED: "stream.remote_created",
-
-    EVENT_TYPE_REMOTE_ENDED: "stream.remote_ended",
-    TRACK_MUTE_CHANGED: "rtc.track_mute_changed"
-};
-
-module.exports = StreamEventTypes;
-},{}],85:[function(require,module,exports){
 var AuthenticationEvents = {
     /**
      * Event callback arguments:
@@ -22313,7 +22401,7 @@ var AuthenticationEvents = {
 };
 module.exports = AuthenticationEvents;
 
-},{}],86:[function(require,module,exports){
+},{}],85:[function(require,module,exports){
 var DesktopSharingEventTypes = {
     INIT: "ds.init",
 
@@ -22329,7 +22417,7 @@ var DesktopSharingEventTypes = {
 
 module.exports = DesktopSharingEventTypes;
 
-},{}],87:[function(require,module,exports){
+},{}],86:[function(require,module,exports){
 module.exports = {
     /**
      * An event carrying connection statistics.
@@ -22345,12 +22433,12 @@ module.exports = {
     STOP: "statistics.stop"
 };
 
-},{}],88:[function(require,module,exports){
+},{}],87:[function(require,module,exports){
 var Constants = {
     LOCAL_JID: 'local'
 };
 module.exports = Constants;
-},{}],89:[function(require,module,exports){
+},{}],88:[function(require,module,exports){
 var XMPPEvents = {
     // Designates an event indicating that the connection to the XMPP server
     // failed.
diff --git a/modules/RTC/JitsiLocalTrack.js b/modules/RTC/JitsiLocalTrack.js
index bab9cae96..e6cb52b84 100644
--- a/modules/RTC/JitsiLocalTrack.js
+++ b/modules/RTC/JitsiLocalTrack.js
@@ -1,6 +1,6 @@
 var JitsiTrack = require("./JitsiTrack");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var RTCBrowserType = require("./RTCBrowserType");
+var JitsiTrackEvents = require('../../JitsiTrackEvents');
 var RTC = require("./RTCUtils");
 
 /**
@@ -13,14 +13,15 @@ function JitsiLocalTrack(stream, videoType,
     this.videoType = videoType;
     this.dontFireRemoveEvent = false;
     this.resolution = resolution;
+    this.startMuted = false;
     var self = this;
     JitsiTrack.call(this, null, stream,
         function () {
-            if(!self.dontFireRemoveEvent && self.rtc)
-                self.rtc.eventEmitter.emit(
-                    StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, self);
-            self.dontFireRemoveEvent = false;
-        });
+            if(!this.dontFireRemoveEvent)
+                this.eventEmitter.emit(
+                    JitsiTrackEvents.TRACK_STOPPED);
+            this.dontFireRemoveEvent = false;
+        }.bind(this));
 
 }
 
@@ -33,14 +34,14 @@ JitsiLocalTrack.prototype.constructor = JitsiLocalTrack;
  */
 JitsiLocalTrack.prototype._setMute = function (mute) {
     if(!this.rtc) {
-        console.error("Mute is not supported for streams not attached to conference!");
+        this.startMuted = mute;
         return;
     }
     var isAudio = this.type === JitsiTrack.AUDIO;
     this.dontFireRemoveEvent = false;
 
     if ((window.location.protocol != "https:") ||
-        (isAudio) || this.videoType === "screen" ||
+        (isAudio) || this.videoType === "desktop" ||
         // FIXME FF does not support 'removeStream' method used to mute
         RTCBrowserType.isFirefox()) {
 
@@ -52,7 +53,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
             this.rtc.room.setAudioMute(mute);
         else
             this.rtc.room.setVideoMute(mute);
-        this.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+        this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
     } else {
         if (mute) {
             this.dontFireRemoveEvent = true;
@@ -63,7 +64,7 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
             else
                 this.rtc.room.setVideoMute(mute);
             this.stream = null;
-            this.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+            this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
             //FIXME: Maybe here we should set the SRC for the containers to something
         } else {
             var self = this;
@@ -95,7 +96,8 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
                                 self.rtc.room.setAudioMute(mute);
                             else
                                 self.rtc.room.setVideoMute(mute);
-                            self.rtc.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, self);
+                            self.eventEmitter.emit(
+                                JitsiTrackEvents.TRACK_MUTE_CHANGED);
                         });
                 });
         }
@@ -111,7 +113,7 @@ JitsiLocalTrack.prototype.stop = function () {
         return;
     if(this.rtc)
         this.rtc.room.removeStream(this.stream);
-    this.rtc.stopMediaStream(this.stream);
+    RTC.stopMediaStream(this.stream);
     this.detach();
 }
 
@@ -148,4 +150,11 @@ JitsiLocalTrack.prototype._setRTC = function (rtc) {
     this.rtc = rtc;
 };
 
+/**
+ * Return true;
+ */
+JitsiLocalTrack.prototype.isLocal = function () {
+    return true;
+}
+
 module.exports = JitsiLocalTrack;
diff --git a/modules/RTC/JitsiRemoteTrack.js b/modules/RTC/JitsiRemoteTrack.js
index aa7db5ee9..4d44d4191 100644
--- a/modules/RTC/JitsiRemoteTrack.js
+++ b/modules/RTC/JitsiRemoteTrack.js
@@ -1,5 +1,5 @@
 var JitsiTrack = require("./JitsiTrack");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
+var JitsiTrackEvents = require("../../JitsiTrackEvents");
 
 /**
  * Represents a single media track (either audio or video).
@@ -10,11 +10,11 @@ var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
  * @param eventEmitter the event emitter
  * @constructor
  */
-function JitsiRemoteTrack(RTC, data, sid, ssrc, eventEmitter) {
+function JitsiRemoteTrack(RTC, data, sid, ssrc) {
     JitsiTrack.call(this, RTC, data.stream,
         function () {
-            eventEmitter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_ENDED, self);
-        });
+            this.eventEmitter.emit(JitsiTrackEvents.TRACK_STOPPED);
+        }.bind(this));
     this.rtc = RTC;
     this.sid = sid;
     this.stream = data.stream;
@@ -24,10 +24,8 @@ function JitsiRemoteTrack(RTC, data, sid, ssrc, eventEmitter) {
     this.muted = false;
     if((this.type === JitsiTrack.AUDIO && data.audiomuted)
       || (this.type === JitsiTrack.VIDEO && data.videomuted)) {
-        this.muted = true
+        this.muted = true;
     }
-    this.eventEmitter = eventEmitter;
-    var self = this;
 }
 
 JitsiRemoteTrack.prototype = Object.create(JitsiTrack.prototype);
@@ -40,7 +38,7 @@ JitsiRemoteTrack.prototype.constructor = JitsiRemoteTrack;
 JitsiRemoteTrack.prototype.setMute = function (value) {
     this.stream.muted = value;
     this.muted = value;
-    this.eventEmitter.emit(StreamEventTypes.TRACK_MUTE_CHANGED, this);
+    this.eventEmitter.emit(JitsiTrackEvents.TRACK_MUTE_CHANGED);
 };
 
 /**
@@ -59,6 +57,13 @@ JitsiRemoteTrack.prototype.getParitcipantId = function() {
     return Strophe.getResourceFromJid(this.peerjid);
 };
 
+/**
+ * Return false;
+ */
+JitsiRemoteTrack.prototype.isLocal = function () {
+    return false;
+}
+
 delete JitsiRemoteTrack.prototype.stop;
 
 delete JitsiRemoteTrack.prototype.start;
diff --git a/modules/RTC/JitsiTrack.js b/modules/RTC/JitsiTrack.js
index 2042d2415..82d41d51e 100644
--- a/modules/RTC/JitsiTrack.js
+++ b/modules/RTC/JitsiTrack.js
@@ -1,4 +1,6 @@
 var RTCBrowserType = require("./RTCBrowserType");
+var JitsiTrackEvents = require("../../JitsiTrackEvents");
+var EventEmitter = require("events");
 
 /**
  * This implements 'onended' callback normally fired by WebRTC after the stream
@@ -54,6 +56,8 @@ function JitsiTrack(rtc, stream, streamInactiveHandler)
     this.containers = [];
     this.rtc = rtc;
     this.stream = stream;
+    this.eventEmitter = new EventEmitter();
+    this.audioLevel = -1;
     this.type = (this.stream.getVideoTracks().length > 0)?
         JitsiTrack.VIDEO : JitsiTrack.AUDIO;
     if(this.type == "audio") {
@@ -184,5 +188,42 @@ JitsiTrack.prototype.isActive = function () {
         return true;
 };
 
+/**
+ * Attaches a handler for events(For example - "audio level changed".).
+ * All possible event are defined in JitsiTrackEvents.
+ * @param eventId the event ID.
+ * @param handler handler for the event.
+ */
+JitsiTrack.prototype.on = function (eventId, handler) {
+    if(this.eventEmitter)
+        this.eventEmitter.on(eventId, handler);
+}
+
+/**
+ * Removes event listener
+ * @param eventId the event ID.
+ * @param [handler] optional, the specific handler to unbind
+ */
+JitsiTrack.prototype.off = function (eventId, handler) {
+    if(this.eventEmitter)
+        this.eventEmitter.removeListener(eventId, handler);
+}
+
+// Common aliases for event emitter
+JitsiTrack.prototype.addEventListener = JitsiTrack.prototype.on;
+JitsiTrack.prototype.removeEventListener = JitsiTrack.prototype.off;
+
+
+/**
+ * Sets the audio level for the stream
+ * @param audioLevel the new audio level
+ */
+JitsiTrack.prototype.setAudioLevel = function (audioLevel) {
+    if(this.audioLevel !== audioLevel) {
+        this.eventEmitter.emit(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
+            audioLevel);
+        this.audioLevel = audioLevel;
+    }
+ }
 
 module.exports = JitsiTrack;
diff --git a/modules/RTC/RTC.js b/modules/RTC/RTC.js
index 00bc5a425..c1839020a 100644
--- a/modules/RTC/RTC.js
+++ b/modules/RTC/RTC.js
@@ -9,7 +9,6 @@ var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
 var DesktopSharingEventTypes
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes.js");
 var RTCEvents = require("../../service/RTC/RTCEvents.js");
 
 function createLocalTracks(streams) {
@@ -20,10 +19,6 @@ function createLocalTracks(streams) {
         newStreams.push(localStream);
         if (streams[i].isMuted === true)
             localStream.setMute(true);
-        //FIXME:
-        // var eventType = StreamEventTypes.EVENT_TYPE_LOCAL_CREATED;
-        //
-        // eventEmitter.emit(eventType, localStream);
     }
     return newStreams;
 }
@@ -31,6 +26,8 @@ function createLocalTracks(streams) {
 function RTC(room, options) {
     this.room = room;
     this.localStreams = [];
+    //FIXME: we should start removing those streams.
+    //FIXME: We should support multiple streams per jid.
     this.remoteStreams = {};
     this.localAudio = null;
     this.localVideo = null;
@@ -38,12 +35,14 @@ function RTC(room, options) {
     var self = this;
     this.options = options || {};
     room.addPresenceListener("videomuted", function (values, from) {
-        if(self.remoteStreams[from])
+        if(self.remoteStreams[from]) {
             self.remoteStreams[from][JitsiTrack.VIDEO].setMute(values.value == "true");
+        }
     });
     room.addPresenceListener("audiomuted", function (values, from) {
-        if(self.remoteStreams[from])
+        if(self.remoteStreams[from]) {
             self.remoteStreams[from][JitsiTrack.AUDIO].setMute(values.value == "true");
+        }
     });
 }
 
@@ -104,7 +103,8 @@ RTC.isRTCReady = function () {
 }
 
 RTC.init = function (options) {
-    return RTCUtils.init(options || {});
+    this.options = options || {};
+    return RTCUtils.init(this.options);
 }
 
 RTC.getDeviceAvailability = function () {
@@ -132,8 +132,7 @@ RTC.prototype.removeLocalStream = function (stream) {
 };
 
 RTC.prototype.createRemoteStream = function (data, sid, thessrc) {
-    var remoteStream = new JitsiRemoteTrack(this, data, sid, thessrc,
-        this.eventEmitter);
+    var remoteStream = new JitsiRemoteTrack(this, data, sid, thessrc);
     if(!data.peerjid)
         return;
     var jid = data.peerjid;
@@ -141,7 +140,6 @@ RTC.prototype.createRemoteStream = function (data, sid, thessrc) {
         this.remoteStreams[jid] = {};
     }
     this.remoteStreams[jid][remoteStream.type]= remoteStream;
-    this.eventEmitter.emit(StreamEventTypes.EVENT_TYPE_REMOTE_CREATED, remoteStream);
     return remoteStream;
 };
 
@@ -193,24 +191,6 @@ RTC.prototype.getVideoElementName = function () {
 RTC.prototype.dispose = function() {
 };
 
-RTC.prototype.muteRemoteVideoStream = function (jid, value) {
-    var stream;
-
-    if(this.remoteStreams[jid] &&
-        this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE]) {
-        stream = this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE];
-    }
-
-    if(!stream)
-        return true;
-
-    if (value != stream.muted) {
-        stream.setMute(value);
-        return true;
-    }
-    return false;
-};
-
 RTC.prototype.switchVideoStreams = function (newStream) {
     this.localVideo.stream = newStream;
 
@@ -222,37 +202,8 @@ RTC.prototype.switchVideoStreams = function (newStream) {
     this.localStreams.push(this.localVideo);
 };
 
-RTC.prototype.isVideoMuted = function (jid) {
-    if (jid === APP.xmpp.myJid()) {
-        var localVideo = APP.RTC.localVideo;
-        return (!localVideo || localVideo.isMuted());
-    } else {
-        if (!this.remoteStreams[jid] ||
-            !this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE]) {
-            return null;
-        }
-        return this.remoteStreams[jid][MediaStreamType.VIDEO_TYPE].muted;
-    }
-};
-
-RTC.prototype.setVideoMute = function (mute, callback, options) {
-    if (!this.localVideo)
-        return;
-
-    if (mute == this.localVideo.isMuted())
-    {
-        APP.xmpp.sendVideoInfoPresence(mute);
-        if (callback)
-            callback(mute);
-    }
-    else
-    {
-        this.localVideo.setMute(mute);
-        this.room.setVideoMute(
-            mute,
-            callback,
-            options);
-    }
-};
-
+RTC.prototype.setAudioLevel = function (jid, audioLevel) {
+    if(this.remoteStreams[jid] && this.remoteStreams[jid][JitsiTrack.AUDIO])
+        this.remoteStreams[jid][JitsiTrack.AUDIO].setAudioLevel(audioLevel);
+}
 module.exports = RTC;
diff --git a/modules/statistics/LocalStatsCollector.js b/modules/statistics/LocalStatsCollector.js
index f224871a3..8492c5007 100644
--- a/modules/statistics/LocalStatsCollector.js
+++ b/modules/statistics/LocalStatsCollector.js
@@ -4,9 +4,6 @@
  */
 
 var RTCBrowserType = require('../RTC/RTCBrowserType');
-var StatisticsEvents = require('../../service/statistics/Events');
-
-var LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID;
 
 /**
  * Size of the webaudio analyzer buffer.
@@ -67,16 +64,16 @@ function animateLevel(newLevel, lastLevel) {
  *
  * @param stream the local stream
  * @param interval stats refresh interval given in ms.
+ * @param callback function that receives the audio levels.
  * @constructor
  */
-function LocalStatsCollector(stream, interval, statisticsService, eventEmitter) {
+function LocalStatsCollector(stream, interval, callback) {
     window.AudioContext = window.AudioContext || window.webkitAudioContext;
     this.stream = stream;
     this.intervalId = null;
     this.intervalMilis = interval;
-    this.eventEmitter = eventEmitter;
     this.audioLevel = 0;
-    this.statisticsService = statisticsService;
+    this.callback = callback;
 }
 
 /**
@@ -106,10 +103,7 @@ LocalStatsCollector.prototype.start = function () {
             var audioLevel = timeDomainDataToAudioLevel(array);
             if (audioLevel != self.audioLevel) {
                 self.audioLevel = animateLevel(audioLevel, self.audioLevel);
-                self.eventEmitter.emit(
-                    StatisticsEvents.AUDIO_LEVEL,
-                    self.statisticsService.LOCAL_JID,
-                    self.audioLevel);
+                self.callback(self.audioLevel);
             }
         },
         this.intervalMilis
@@ -126,4 +120,4 @@ LocalStatsCollector.prototype.stop = function () {
     }
 };
 
-module.exports = LocalStatsCollector;
\ No newline at end of file
+module.exports = LocalStatsCollector;
diff --git a/modules/statistics/statistics.js b/modules/statistics/statistics.js
index ee95349a8..cf3d13c16 100644
--- a/modules/statistics/statistics.js
+++ b/modules/statistics/statistics.js
@@ -18,8 +18,9 @@ var StatisticsEvents = require("../../service/statistics/Events");
 //    }
 //}
 
+var eventEmitter = new EventEmitter();
+
 function Statistics() {
-    this.localStats = null;
     this.rtpStats = null;
     this.eventEmitter = new EventEmitter();
 }
@@ -33,14 +34,13 @@ Statistics.prototype.startRemoteStats = function (peerconnection) {
     this.rtpStats.start();
 }
 
-Statistics.prototype.startLocalStats = function (stream) {
-    if(stream.getType() !== "audio")
-        return;
-    this.localStats = new LocalStats(stream.getOriginalStream(), 200, this,
-        this.eventEmitter);
-    this.localStats.start();
-}
+Statistics.localStats = [];
 
+Statistics.startLocalStats = function (stream, callback) {
+    var localStats = new LocalStats(stream, 200, callback);
+    this.localStats.push(localStats);
+    localStats.start();
+}
 
 Statistics.prototype.addAudioLevelListener = function(listener)
 {
@@ -53,20 +53,29 @@ Statistics.prototype.removeAudioLevelListener = function(listener)
 }
 
 Statistics.prototype.dispose = function () {
-    this.stopLocal();
+    Statistics.stopAllLocalStats();
     this.stopRemote();
     if(this.eventEmitter)
-    {
         this.eventEmitter.removeAllListeners();
-    }
+
+    if(eventEmitter)
+        eventEmitter.removeAllListeners();
 }
 
 
-Statistics.prototype.stopLocal = function () {
-    if (this.localStats) {
-        this.localStats.stop();
-        this.localStats = null;
-    }
+Statistics.stopAllLocalStats = function () {
+    for(var i = 0; i < this.localStats.length; i++)
+        this.localStats[i].stop();
+    this.localStats = [];
+}
+
+Statistics.stopLocalStats = function (stream) {
+    for(var i = 0; i < Statistics.localStats.length; i++)
+        if(Statistics.localStats[i].stream === stream){
+            var localStats = Statistics.localStats.splice(i, 1);
+            localStats.stop();
+            break;
+        }
 }
 
 Statistics.prototype.stopRemote = function () {
@@ -144,4 +153,4 @@ Statistics.LOCAL_JID = require("../../service/statistics/constants").LOCAL_JID;
 
 
 
-module.exports = Statistics;
\ No newline at end of file
+module.exports = Statistics;
diff --git a/modules/xmpp/ChatRoom.js b/modules/xmpp/ChatRoom.js
index 5e943bd3d..3e4645102 100644
--- a/modules/xmpp/ChatRoom.js
+++ b/modules/xmpp/ChatRoom.js
@@ -515,10 +515,10 @@ ChatRoom.prototype.setJingleSession = function(session){
 };
 
 
-ChatRoom.prototype.removeStream = function (stream) {
+ChatRoom.prototype.removeStream = function (stream, callback) {
     if(!this.session)
         return;
-    this.session.peerconnection.removeStream(stream)
+    this.session.removeStream(stream, callback);
 }
 
 ChatRoom.prototype.switchStreams = function (stream, oldStream, callback, isAudio) {
diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js
index f12dcbb86..b59e53a46 100644
--- a/modules/xmpp/JingleSessionPC.js
+++ b/modules/xmpp/JingleSessionPC.js
@@ -1235,6 +1235,43 @@ JingleSessionPC.prototype.addStream = function (stream, callback) {
     });
 }
 
+/**
+ * Remove streams.
+ * @param stream stream that will be removed.
+ * @param success_callback callback executed after successful stream addition.
+ */
+JingleSessionPC.prototype.removeStream = function (stream, callback) {
+
+    var self = this;
+
+    // Remember SDP to figure out added/removed SSRCs
+    var oldSdp = null;
+    if(this.peerconnection) {
+        if(this.peerconnection.localDescription) {
+            oldSdp = new SDP(this.peerconnection.localDescription.sdp);
+        }
+        if(stream)
+            this.peerconnection.removeStream(stream);
+    }
+
+    // Conference is not active
+    if(!oldSdp || !this.peerconnection) {
+        callback();
+        return;
+    }
+
+    this.addingStreams = true;
+    this.modifySourcesQueue.push(function() {
+        logger.log('modify sources done');
+
+        callback();
+
+        var newSdp = new SDP(self.peerconnection.localDescription.sdp);
+        logger.log("SDPs", oldSdp, newSdp);
+        self.notifyMySSRCUpdate(oldSdp, newSdp);
+    });
+}
+
 /**
  * Figures out added/removed ssrcs and send update IQs.
  * @param old_sdp SDP object for old description.
diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js
index 703377f46..8eb344019 100644
--- a/modules/xmpp/xmpp.js
+++ b/modules/xmpp/xmpp.js
@@ -3,7 +3,6 @@
 var logger = require("jitsi-meet-logger").getLogger(__filename);
 var EventEmitter = require("events");
 var Pako = require("pako");
-var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var JitsiConnectionErrors = require("../../JitsiConnectionErrors");
@@ -124,7 +123,7 @@ XMPP.prototype._connect = function (jid, password) {
                         logger.warn("Ping NOT supported by " + pingJid);
                 }
             );
-            
+
             if (password)
                 authenticatedUser = true;
             if (self.connection && self.connection.connected &&