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

- fix problem where the first moderator doesn't become presenter if no presentation has been

Browse Source 
pre-uploaded. See issue http://code.google.com/p/bigbluebutton/issues/detail?id=1103
This commit is contained in:
Richard Alam 2012-01-04 16:15:23 +00:00
parent 0bad7f6a59
commit 529b340d20
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentProxy.as
View File

@ -124,8 +124,6 @@ package org.bigbluebutton.modules.present.business
var service:PresentationService = new PresentationService();
service.load(fullUri, slides, slideUri);
LogUtil.debug('number of slides=' + slides.size());
triggerSwitchPresenter();
}
/**
@ -153,42 +151,7 @@ package org.bigbluebutton.modules.present.business
}
/***
* NOTE:
* This is a workaround to trigger the UI to switch to presenter or viewer.
* The reason is that when the user joins, the MadePresenterEvent in UserServiceSO
* doesn't get received by the modules as the modules hasn't started yet.
* Need to redo the proper sequence of events but will take a lot of changes.
* (ralam dec 8, 2011).
*/
public function triggerSwitchPresenter():void {
var dispatcher:Dispatcher = new Dispatcher();
var meeting:Conference = UserManager.getInstance().getConference();
if (meeting.amIPresenter()) {
LogUtil.debug("trigger Switch to Presenter mode ");
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_PRESENTER_MODE);
e.userid = meeting.getMyUserId();
e.presenterName = meeting.getMyName();
e.assignerBy = meeting.getMyUserId();
dispatcher.dispatchEvent(e);
} else {
var p:BBBUser = meeting.getPresenter();
if (p != null) {
LogUtil.debug("trigger Switch to Viewer mode ");
var viewerEvent:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_VIEWER_MODE);
viewerEvent.userid = p.userid;
viewerEvent.presenterName = p.name;
viewerEvent.assignerBy = p.userid;
dispatcher.dispatchEvent(viewerEvent);
}
}
}
/**
* Move the slide within the presentation window
* @param e

39
bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentSOService.as
View File

@ -31,6 +31,7 @@ package org.bigbluebutton.modules.present.business {
import org.bigbluebutton.core.managers.UserManager;
import org.bigbluebutton.main.events.BBBEvent;
import org.bigbluebutton.main.events.MadePresenterEvent;
import org.bigbluebutton.main.model.users.BBBUser;
import org.bigbluebutton.main.model.users.Conference;
import org.bigbluebutton.modules.present.events.CursorEvent;
import org.bigbluebutton.modules.present.events.MoveEvent;
@ -334,6 +335,9 @@ package org.bigbluebutton.modules.present.business {
sendPresentationName(u as String);
}
}
// Force switching the presenter.
triggerSwitchPresenter();
},
// status - On error occurred
function(status:Object):void {
@ -346,6 +350,41 @@ package org.bigbluebutton.modules.present.business {
); //_netConnection.call
}
/***
* NOTE:
* This is a workaround to trigger the UI to switch to presenter or viewer.
* The reason is that when the user joins, the MadePresenterEvent in UserServiceSO
* doesn't get received by the modules as the modules hasn't started yet.
* Need to redo the proper sequence of events but will take a lot of changes.
* (ralam dec 8, 2011).
*/
public function triggerSwitchPresenter():void {
var dispatcher:Dispatcher = new Dispatcher();
var meeting:Conference = UserManager.getInstance().getConference();
if (meeting.amIPresenter()) {
LogUtil.debug("trigger Switch to Presenter mode ");
var e:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_PRESENTER_MODE);
e.userid = meeting.getMyUserId();
e.presenterName = meeting.getMyName();
e.assignerBy = meeting.getMyUserId();
dispatcher.dispatchEvent(e);
} else {
var p:BBBUser = meeting.getPresenter();
if (p != null) {
LogUtil.debug("trigger Switch to Viewer mode ");
var viewerEvent:MadePresenterEvent = new MadePresenterEvent(MadePresenterEvent.SWITCH_TO_VIEWER_MODE);
viewerEvent.userid = p.userid;
viewerEvent.presenterName = p.name;
viewerEvent.assignerBy = p.userid;
dispatcher.dispatchEvent(viewerEvent);
}
}
}
private function sendPresentationName(presentationName:String):void {
var uploadEvent:UploadEvent = new UploadEvent(UploadEvent.CONVERT_SUCCESS);
uploadEvent.presentationName = presentationName;