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

- BBB now starts properly on red5 r4582. Need a bit more testing though.

Browse Source
This commit is contained in:
Richard Alam 2013-03-08 22:49:11 +00:00
parent 412f44690b
commit ece4ef7f1f
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java
View File

@ -88,7 +88,7 @@ public class LayoutHandler extends ApplicationAdapter implements IApplication {
public boolean roomConnect(IConnection connection, Object[] params) {
log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
ISharedObject so = getSharedObject(connection.getScope(), LAYOUT_SO);
ISharedObject so = getSharedObject(connection.getScope(), LAYOUT_SO, false);
log.debug("Setting up Listener");
LayoutSender sender = new LayoutSender(so);
String room = connection.getScope().getName();

2
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
View File

@ -89,7 +89,7 @@ public class ParticipantsHandler extends ApplicationAdapter implements IApplicat
public boolean roomConnect(IConnection connection, Object[] params) {
log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
ISharedObject so = getSharedObject(connection.getScope(), PARTICIPANTS_SO);
ISharedObject so = getSharedObject(connection.getScope(), PARTICIPANTS_SO, false);
ParticipantsEventSender sender = new ParticipantsEventSender(so);
ParticipantsEventRecorder recorder = new ParticipantsEventRecorder(connection.getScope().getName(), recorderApplication);

27
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
View File

@ -82,26 +82,13 @@ public class PresentationHandler extends ApplicationAdapter implements IApplicat
public boolean roomConnect(IConnection connection, Object[] params) {
log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
IScope scope = Red5.getConnectionLocal().getScope();
if (!hasSharedObject(scope, PRESENTATION_SO)) {
if (createSharedObject(scope, PRESENTATION_SO, false)) {
ISharedObject so = getSharedObject(connection.getScope(), PRESENTATION_SO);
log.debug("Setting up recorder");
PresentationEventSender sender = new PresentationEventSender(so);
PresentationEventRecorder recorder = new PresentationEventRecorder(connection.getScope().getName(), recorderApplication);
log.debug("Adding room listener");
presentationApplication.addRoomListener(connection.getScope().getName(), recorder);
presentationApplication.addRoomListener(connection.getScope().getName(), sender);
log.debug("Done setting up recorder and listener");
return true;
}
}
return false;
ISharedObject so = getSharedObject(connection.getScope(), PRESENTATION_SO, false);
PresentationEventSender sender = new PresentationEventSender(so);
PresentationEventRecorder recorder = new PresentationEventRecorder(connection.getScope().getName(), recorderApplication);
presentationApplication.addRoomListener(connection.getScope().getName(), recorder);
presentationApplication.addRoomListener(connection.getScope().getName(), sender);
return true;
}
@Override

2
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
View File

@ -98,7 +98,7 @@ public class VoiceHandler extends ApplicationAdapter implements IApplication{
public boolean roomConnect(IConnection connection, Object[] params) {
log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
ISharedObject so = getSharedObject(connection.getScope(), VOICE_SO);
ISharedObject so = getSharedObject(connection.getScope(), VOICE_SO, false);
String voiceBridge = getBbbSession().getVoiceBridge();
String meetingid = getBbbSession().getConference();