BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #491 from SenecaCDOT-BigBlueButton/webrtc-audio-fixes

Browse Source 
Three fixes for audio in the Flash client
This commit is contained in:
Fred Dixon 2015-01-21 16:30:53 -05:00
commit 02bc78c9a0
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml Normal file → Executable file
View File

@ -77,7 +77,7 @@ $Id: $
if (e.message.talking){ if (e.message.talking){
muteMeBtnImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)]; muteMeBtnImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
} else { } else {
muteMeBtnImg.filters = [new GlowFilter(0x555555, 1, 6, 6, 2, BitmapFilterQuality.HIGH, true, true)]; muteMeBtnImg.filters = [];
} }
} }
} }
@ -98,7 +98,8 @@ $Id: $
private function handleJoinedVoiceConferenceEvent(event:BBBEvent):void { private function handleJoinedVoiceConferenceEvent(event:BBBEvent):void {
if (UsersUtil.isMe(event.payload.userID)) { if (UsersUtil.isMe(event.payload.userID)) {
trace(LOG + "User has joined the conference using flash"); trace(LOG + "User has joined the conference using flash");
updateMuteMeBtn(); updateMuteMeBtn();
muteMeBtnImg.filters = [];
} }
} }

4
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
View File

@ -58,6 +58,8 @@ package org.bigbluebutton.modules.phone.managers
ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.title"),
ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message"))); ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message")));
} }
usingWebRTC = checkIfToUseWebRTC();
} }
private function isWebRTCSupported():Boolean { private function isWebRTCSupported():Boolean {
@ -145,8 +147,6 @@ package org.bigbluebutton.modules.phone.managers
public function handleJoinVoiceConferenceCommand(event:JoinVoiceConferenceCommand):void { public function handleJoinVoiceConferenceCommand(event:JoinVoiceConferenceCommand):void {
trace(LOG + "handleJoinVoiceConferenceCommand - usingWebRTC: " + usingWebRTC + ", event.mic: " + event.mic); trace(LOG + "handleJoinVoiceConferenceCommand - usingWebRTC: " + usingWebRTC + ", event.mic: " + event.mic);
usingWebRTC = checkIfToUseWebRTC();
if (!usingWebRTC || !event.mic) return; if (!usingWebRTC || !event.mic) return;
if (options.skipCheck || echoTestDone) { if (options.skipCheck || echoTestDone) {

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
View File

@ -191,7 +191,7 @@
if(data.talking && !rolledOver){ if(data.talking && !rolledOver){
muteImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)]; muteImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
}else{ }else{
muteImg.filters = [new GlowFilter(0x555555, 1, 6, 6, 2, BitmapFilterQuality.HIGH, true, true)]; muteImg.filters = [];
} }
} }
} }