haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes inconsistent local video muted status.

This commit is contained in:
paweldomas 2015-07-30 14:11:11 +02:00
parent 2ffe178456
commit 8469a282c1
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/RTC/LocalStream.js
View File

@ -44,29 +44,27 @@ LocalStream.prototype.isAudioStream = function () {
return this.type === "audio";
};
LocalStream.prototype.setMute = function(mute)
LocalStream.prototype.setMute = function (mute)
{
var isAudio = this.isAudioStream();
var eventType = isAudio ? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE;
if((window.location.protocol != "https:" && this.isGUMStream) ||
(this.isAudioStream() && this.isGUMStream) || this.videoType === "screen")
if ((window.location.protocol != "https:" && this.isGUMStream) ||
(isAudio && this.isGUMStream) || this.videoType === "screen")
{
var tracks = this.getTracks();
for (var idx = 0; idx < tracks.length; idx++) {
tracks[idx].enabled = mute;
tracks[idx].enabled = !mute;
}
this.eventEmitter.emit(
(this.type == "audio"? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE),
!mute);
this.eventEmitter.emit(eventType, mute);
}
else
{
if(mute === false) {
if (mute) {
APP.xmpp.removeStream(this.stream);
this.stream.stop();
this.eventEmitter.emit(
(this.type == "audio"? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE),
true);
this.eventEmitter.emit(eventType, true);
}
else
{
@ -74,22 +72,18 @@ LocalStream.prototype.setMute = function(mute)
APP.RTC.rtcUtils.obtainAudioAndVideoPermissions(
(this.isAudioStream() ? ["audio"] : ["video"]),
function (stream) {
if(self.isAudioStream())
if (isAudio)
{
APP.RTC.changeLocalAudio(stream,
function () {
self.eventEmitter.emit(
(self.type == "audio"? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE),
true);
self.eventEmitter.emit(eventType, false);
});
}
else
{
APP.RTC.changeLocalVideo(stream, false,
function () {
self.eventEmitter.emit(
(self.type == "audio"? RTCEvents.AUDIO_MUTE : RTCEvents.VIDEO_MUTE),
true);
self.eventEmitter.emit(eventType, false);
});
}
});

8
modules/RTC/RTC.js
View File

@ -274,19 +274,19 @@ var RTC = {
return isDesktop;
},
setVideoMute: function(mute, callback, options) {
if(!this.localVideo)
setVideoMute: function (mute, callback, options) {
if (!this.localVideo)
return;
if (mute == APP.RTC.localVideo.isMuted())
{
APP.xmpp.sendVideoInfoPresence(mute);
if(callback)
if (callback)
callback(mute);
}
else
{
APP.RTC.localVideo.setMute(!mute);
APP.RTC.localVideo.setMute(mute);
APP.xmpp.setVideoMute(
mute,
callback,