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

Start with mic, autoskip then back to normal

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2014-10-13 17:40:41 -03:00
parent 58ba804379
commit 5d7c566e95
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
View File

@ -116,6 +116,10 @@ package org.bigbluebutton.core
public static function amIModerator():Boolean { public static function amIModerator():Boolean {
return UserManager.getInstance().getConference().amIModerator(); return UserManager.getInstance().getConference().amIModerator();
} }
public static function myFirstConnection():Boolean {
return UserManager.getInstance().getConference().myFirstConnection();
}
public static function amIPresenter():Boolean { public static function amIPresenter():Boolean {
return UserManager.getInstance().getConference().amIPresenter; return UserManager.getInstance().getConference().amIPresenter;
@ -177,6 +181,5 @@ package org.bigbluebutton.core
} }
return null; return null;
} }
} }
} }

8
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
View File

@ -35,6 +35,7 @@ package org.bigbluebutton.main.model.users {
public var avatarURL:String; public var avatarURL:String;
public var voiceBridge:String; public var voiceBridge:String;
public var dialNumber:String; public var dialNumber:String;
public var firstConnection:Boolean = true;
[Bindable] public var record:Boolean; [Bindable] public var record:Boolean;
private static const LOG:String = "main.model.users::Conference - "; private static const LOG:String = "main.model.users::Conference - ";
@ -288,6 +289,13 @@ package org.bigbluebutton.main.model.users {
return me.role == Role.MODERATOR; return me.role == Role.MODERATOR;
} }
public function myFirstConnection():Boolean {
if (firstConnection) {
firstConnection = false;
return true;
} else return false;
}
public function muteMyVoice(mute:Boolean):void { public function muteMyVoice(mute:Boolean):void {
voiceMuted = mute; voiceMuted = mute;
} }

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

@ -97,7 +97,7 @@
* after. (richard mar 28, 2014) * after. (richard mar 28, 2014)
*/ */
if (mic) { if (mic) {
if (options.skipCheck) { if (options.skipCheck || UsersUtil.myFirstConnection()) {
JSLog.debug(LOG + "Calling into voice conference. skipCheck=[" + options.skipCheck + "] echoTestDone=[" + echoTestDone + "]"); JSLog.debug(LOG + "Calling into voice conference. skipCheck=[" + options.skipCheck + "] echoTestDone=[" + echoTestDone + "]");
trace(LOG + "Calling into voice conference. skipCheck=[" + options.skipCheck + "] echoTestDone=[" + echoTestDone + "]"); trace(LOG + "Calling into voice conference. skipCheck=[" + options.skipCheck + "] echoTestDone=[" + echoTestDone + "]");
callIntoVoiceConference(); callIntoVoiceConference();

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

@ -127,7 +127,7 @@ package org.bigbluebutton.modules.phone.managers
if (!usingWebRTC || !event.mic) return; if (!usingWebRTC || !event.mic) return;
if (options.skipCheck || echoTestDone) { if (options.skipCheck || echoTestDone || UsersUtil.myFirstConnection()) {
joinVoiceConference(); joinVoiceConference();
} else { } else {
startWebRTCEchoTest(); startWebRTCEchoTest();

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

@ -117,9 +117,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function onCreationComplete():void { private function onCreationComplete():void {
// when the button is added to the stage display the audio selection window if auto join is true // when the button is added to the stage display the audio selection window if auto join is true
if (phoneOptions.autoJoin) { if (phoneOptions.autoJoin) {
// Enter microphone at start
if (phoneOptions.forceListenOnly) { if (phoneOptions.forceListenOnly) {
var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand(); var command:JoinVoiceConferenceCommand = new JoinVoiceConferenceCommand();
command.mic = false; command.mic = true;
dispatcher.dispatchEvent(command); dispatcher.dispatchEvent(command);
} else { } else {
trace(LOG + "Sending Show Audio Selection command"); trace(LOG + "Sending Show Audio Selection command");