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

Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into support-multiple-logins

Browse Source
This commit is contained in:
Richard Alam 2015-10-08 14:34:02 +00:00
commit c995a7a587
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java
View File

@ -205,7 +205,24 @@ public class PresentationClientMessageSender {
}
private void processPresentationConversionError(String json) {
PresentationConversionErrorMessage msg = PresentationConversionErrorMessage.fromJson(json);
if (msg != null) {
Map<String, Object> args = new HashMap<String, Object>();
args.put("meetingID", msg.meetingId);
args.put("code", msg.code);
args.put("presentationID", msg.presentationId);
args.put("presentationName", msg.presentationName);
args.put("messageKey", msg.messageKey);
args.put("numberOfPages", msg.numPages);
args.put("maxNumberPages", msg.maxNumPages);
Map<String, Object> message = new HashMap<String, Object>();
Gson gson = new Gson();
message.put("msg", gson.toJson(args));
BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "pageCountExceededUpdateMessageCallback", message);
service.sendMessage(m);
}
}
private void processPresentationCursorUpdate(String json) {

8
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
View File

@ -1,5 +1,5 @@
var userID, callerIdName, conferenceVoiceBridge, userAgent=null, userMicMedia, userWebcamMedia, currentSession=null, callTimeout, callActive, callICEConnected, iceConnectedTimeout, callFailCounter, callPurposefullyEnded, uaConnected, transferTimeout;
var userID, callerIdName=null, conferenceVoiceBridge, userAgent=null, userMicMedia, userWebcamMedia, currentSession=null, callTimeout, callActive, callICEConnected, iceConnectedTimeout, callFailCounter, callPurposefullyEnded, uaConnected, transferTimeout;
var inEchoTest = true;
function webRTCCallback(message) {
@ -43,7 +43,8 @@ function callIntoConference(voiceBridge, callback, isListenOnly) {
if (isListenOnly == null) {
isListenOnly = false;
}
// reset callerIdName
callerIdName = null;
if (!callerIdName) {
BBB.getMyUserInfo(function(userInfo) {
console.log("User info callback [myUserID=" + userInfo.myUserID
@ -238,6 +239,9 @@ function webrtc_call(username, voiceBridge, callback, isListenOnly) {
if ((isListenOnly||userMicMedia) && userAgent)
make_call(username, voiceBridge, server, callback, false, isListenOnly);
};
// Reset userAgent so we can successfully switch between listenOnly and listen+speak modes
userAgent = null;
if (!userAgent) {
createUA(username, server, callback, makeCallFunc);
}

1
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
View File

@ -251,6 +251,7 @@ https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/
result =
myUserID: BBB.getMyUserID()
myUsername: BBB.getMyUserName()
myInternalUserID: BBB.getMyUserID()
myAvatarURL: null
myRole: BBB.getMyRole()
amIPresenter: BBB.amIPresenter()

6
bigbluebutton-html5/app/client/views/modals/modals.html
View File

@ -8,9 +8,9 @@
{{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
data_placement="bottom" title="Leave Audio Call"}}
{{else}}
<!-- display join listen only -->
{{> makeButton id="joinListenOnly" btn_class="joinListenOnly settingsButton joinAudioButton" i_class="fi-volume" rel="tooltip"
data_placement="bottom" title="Join Listen only"}}
<!-- display microphone with exit -->
{{> makeButton id="exitAudio" btn_class="exitAudio settingsButton joinAudioButton" i_class="ion-volume-mute" rel="tooltip"
data_placement="bottom" title="Leave Audio Call"}}
{{/if}}
{{else}}
<!-- display both with join -->

2
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
View File

@ -93,7 +93,7 @@ public class PdfToSwfSlidesGenerationService {
if (e.getExceptionType() == CountingPageException.ExceptionType.PAGE_COUNT_EXCEPTION) {
builder.messageKey(ConversionMessageConstants.PAGE_COUNT_FAILED_KEY);
} else if (e.getExceptionType() == CountingPageException.ExceptionType.PAGE_EXCEEDED_EXCEPTION) {
builder.numberOfPages(pres.getNumberOfPages());
builder.numberOfPages(e.getPageCount());
builder.maxNumberPages(e.getMaxNumberOfPages());
builder.messageKey(ConversionMessageConstants.PAGE_COUNT_EXCEEDED_KEY);
}