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

Merge branch '090-force-listen-only' into mconf-live0.6.2

Browse Source
This commit is contained in:
Felipe Cecagno 2015-02-17 21:08:01 -02:00
commit d6f587db7b
3 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
View File

@ -213,6 +213,19 @@
}
public function initialize():void {
JSLog.debug(LOG + "Initializing FlashCallManager, current state: " + state);
trace(LOG + "Initializing FlashCallManager, current state: " + state);
switch (state) {
case STOP_ECHO_THEN_JOIN_CONF:
// if we initialize usingFlash here, we won't be able to hang up from
// the flash connection
JSLog.debug(LOG + "Invalid state for initialize, aborting...");
trace(LOG + "Invalid state for initialize, aborting...");
return;
default:
break;
}
printMics();
options = new PhoneOptions();
if (options.useWebRTCIfAvailable && isWebRTCSupported()) {
@ -380,7 +393,6 @@
return;
}
hangup();
initialize();
}
public function handleBecomeViewer():void {
@ -422,6 +434,8 @@
}
public function handleUseFlashModeCommand():void {
JSLog.debug(LOG + "Using flash mode");
trace(LOG + "Using flash mode");
usingFlash = true;
startCall(true);
}

1
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
View File

@ -100,6 +100,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</EventHandlers>
<EventHandlers type="{JoinVoiceConferenceCommand.JOIN_VOICE_CONF}">
<MethodInvoker generator="{FlashCallManager}" method="initialize"/>
<MethodInvoker generator="{FlashCallManager}" method="handleJoinVoiceConferenceCommand" arguments="{event}"/>
</EventHandlers>

46
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
View File

@ -32,6 +32,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mate:Listener type="{FlashLeftVoiceConferenceEvent.LEFT_VOICE_CONFERENCE}" method="handleFlashLeftVoiceConferenceEvent" />
<mate:Listener type="{FlashJoinedVoiceConferenceEvent.JOINED_VOICE_CONFERENCE}" method="handleFlashJoinedVoiceConferenceEvent" />
<mate:Listener type="{FlashJoinedListenOnlyVoiceConferenceEvent.JOINED_LISTEN_ONLY_VOICE_CONFERENCE}" method="handleFlashJoinedListenOnlyConferenceEvent" />
<mate:Listener type="{FlashEchoTestStoppedEvent.ECHO_TEST_STOPPED}" method="handleStopEchoTestEvent" />
<mate:Listener type="{WebRTCCallEvent.WEBRTC_CALL_STARTED}" method="handleWebRTCCallStartedEvent" />
<mate:Listener type="{WebRTCCallEvent.WEBRTC_CALL_ENDED}" method="handleWebRTCCallEndedEvent" />
<mate:Listener type="{AudioSelectionWindowEvent.CLOSED_AUDIO_SELECTION}" method="handleClosedAudioSelectionWindowEvent" />
@ -49,6 +50,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.main.views.MainToolbar;
import org.bigbluebutton.modules.phone.PhoneOptions;
import org.bigbluebutton.modules.phone.events.AudioSelectionWindowEvent;
import org.bigbluebutton.modules.phone.events.FlashEchoTestStoppedEvent;
import org.bigbluebutton.modules.phone.events.FlashJoinedListenOnlyVoiceConferenceEvent;
import org.bigbluebutton.modules.phone.events.FlashJoinedVoiceConferenceEvent;
import org.bigbluebutton.modules.phone.events.FlashLeftVoiceConferenceEvent;
@ -79,7 +81,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
trace(LOG + "startPhone 2 enabled=[" + enabled + "] selected=[" + selected + "]");
JSLog.debug(LOG + "startPhone 2 enabled=[" + enabled + "] selected=[" + selected + "]");
if (this.selected) {
if (defaultListenOnlyMode()) {
if (defaultListenOnlyMode) {
dispatcher.dispatchEvent(new LeaveVoiceConferenceCommand());
trace(LOG + "Sending Join Conference command");
@ -99,7 +101,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
private function defaultListenOnlyMode():Boolean {
private function get defaultListenOnlyMode():Boolean {
return (phoneOptions.listenOnlyMode && phoneOptions.forceListenOnly);
}
@ -126,7 +128,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function onCreationComplete():void {
// when the button is added to the stage display the audio selection window if auto join is true
if (phoneOptions.autoJoin) {
if (defaultListenOnlyMode()) {
if (defaultListenOnlyMode) {
var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand();
command.mic = true;
dispatcher.dispatchEvent(command);
@ -135,7 +137,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
JSLog.debug(LOG + "Sending Show Audio Selection command");
dispatcher.dispatchEvent(new AudioSelectionWindowEvent(AudioSelectionWindowEvent.SHOW_AUDIO_SELECTION));
}
} else if (defaultListenOnlyMode()) {
} else {
joinDefaultListenOnlyMode();
}
}
@ -154,15 +156,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onUserJoinedListenOnlyConference():void {
this.selected = false;
this.enabled = true;
JSLog.debug(LOG + "onUserJoinedListenOnlyConference enabled=[" + enabled + "] selected=[" + selected + "]");
trace(LOG + "onUserJoinedListenOnlyConference enabled=[" + enabled + "] selected=[" + selected + "]");
JSLog.debug(LOG + "onUserJoinedListenOnlyConference enabled=[" + enabled + "] selected=[" + selected + "]");
_currentState = DEFAULT_STATE;
this.styleName = "voiceConfDefaultButtonStyle";
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.start');
JSLog.debug(LOG + "onUserJoinedListenOnlyConference enabled=[" + enabled + "] selected=[" + selected + "]");
resetButtonState();
}
private function onUserLeftConference():void {
@ -176,11 +173,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
JSLog.debug(LOG + "onUserLeftConference enabled=[" + enabled + "] selected=[" + selected + "]");
}
private function joinDefaultListenOnlyMode():void {
private function joinDefaultListenOnlyMode(micLeft:Boolean = true):void {
if (defaultListenOnlyMode && micLeft) {
var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand();
command.mic = false;
dispatcher.dispatchEvent(command);
}
}
private function handleFlashJoinedVoiceConferenceEvent(event:FlashJoinedVoiceConferenceEvent):void {
trace(LOG + "User has joined the conference using flash");
@ -191,7 +190,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function handleFlashJoinedListenOnlyConferenceEvent(event:FlashJoinedListenOnlyVoiceConferenceEvent):void {
trace(LOG + "User has joined the listen only conference using flash");
JSLog.debug(LOG + "User has joined the listen only conference using flash");
if (defaultListenOnlyMode()) {
if (defaultListenOnlyMode) {
onUserJoinedListenOnlyConference();
} else {
onUserJoinedConference();
@ -203,9 +202,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
JSLog.debug(LOG + "User has left the conference using flash");
var micLeft:Boolean = (_currentState == ACTIVE_STATE);
onUserLeftConference();
if (defaultListenOnlyMode() && micLeft) {
joinDefaultListenOnlyMode();
}
joinDefaultListenOnlyMode(micLeft);
}
private function handleWebRTCCallStartedEvent(event: WebRTCCallEvent):void {
@ -218,9 +215,20 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
JSLog.debug(LOG + "User has left the conference using webrtc");
trace(LOG + "User has left the conference using webrtc");
onUserLeftConference();
if (defaultListenOnlyMode()) {
joinDefaultListenOnlyMode();
}
private function handleStopEchoTestEvent(event:Event):void {
resetButtonState();
joinDefaultListenOnlyMode();
}
private function resetButtonState():void {
this.selected = false;
this.enabled = true;
_currentState = DEFAULT_STATE;
this.styleName = "voiceConfDefaultButtonStyle";
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.start');
}
private function handleClosedAudioSelectionWindowEvent(event:AudioSelectionWindowEvent):void {
@ -231,10 +239,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_currentState = DEFAULT_STATE;
this.styleName = "voiceConfDefaultButtonStyle";
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.start');
if (defaultListenOnlyMode()) {
joinDefaultListenOnlyMode();
}
}
//For whatever reason the tooltip does not update when localization is changed dynamically. Overrideing it here
override protected function resourcesChanged():void {