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

cleanup

Browse Source
This commit is contained in:
Felipe Cecagno 2014-10-05 16:12:12 -03:00
parent 89a9962b3d
commit b9df767480
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
View File

@ -104,7 +104,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function reInitialize():void {
my_nc = new NetConnection();
my_nc.proxyType = "best";
my_nc.proxyType = "best";
my_nc.connect(null);
nsStream = new NetStream(my_nc);
if (mic != null) {

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

@ -80,9 +80,9 @@ 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 (phoneOptions.autoJoin && phoneOptions.forceListenOnly) {
dispatcher.dispatchEvent(new LeaveVoiceConferenceCommand());
}
if (phoneOptions.autoJoin && phoneOptions.forceListenOnly) {
dispatcher.dispatchEvent(new LeaveVoiceConferenceCommand());
}
//trace(LOG + "Sending Join Conference command");
//dispatcher.dispatchEvent(new JoinVoiceConferenceCommand());
trace(LOG + "Sending Show Audio Selection command");
@ -95,11 +95,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
public function remoteClick(event:ShortcutEvent):void {
public function remoteClick(event:ShortcutEvent):void{
this.selected = true;
startPhone();
}
private function mouseOverHandler(event:MouseEvent):void {
if(_currentState == ACTIVE_STATE)
this.styleName = "voiceConfInactiveButtonStyle";
@ -137,9 +138,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
trace(LOG + "onUserJoinedConference enabled=[" + enabled + "] selected=[" + selected + "]");
_currentState = ACTIVE_STATE;
this.styleName = "voiceConfActiveButtonStyle";
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.stop');
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.stop');
}
private function onUserJoinedListenOnlyConference():void {
this.selected = false;
this.enabled = true;
@ -217,9 +218,9 @@ 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 (phoneOptions.autoJoin && phoneOptions.forceListenOnly) {
joinDefaultListenOnlyMode();
}
if (phoneOptions.autoJoin && phoneOptions.forceListenOnly) {
joinDefaultListenOnlyMode();
}
}
//For whatever reason the tooltip does not update when localization is changed dynamically. Overrideing it here

4
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -112,7 +112,7 @@ disableRecordingDefault=false
#----------------------------------------------------
# This URL is where the BBB client is accessible. When a user sucessfully
# enters a name and password, she is redirected here to load the client.
bigbluebutton.web.serverURL=http://10.0.3.100
bigbluebutton.web.serverURL=http://192.168.181.131
#----------------------------------------------------
@ -136,7 +136,7 @@ defaultConfigURL=${bigbluebutton.web.serverURL}/client/conf/config.xml
apiVersion=0.81
# Salt which is used by 3rd-party apps to authenticate api calls
securitySalt=c40fb828a670251f5bcb79b462e1333c
securitySalt=33e06642a13942004fd83b3ba6e4104a
# Directory where we drop the <meeting-id-recorded>.done file
recordStatusDir=/var/bigbluebutton/recording/status/recorded