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

Merge pull request #13190 from jfsiebel/breakouts-presentation

Browse Source 
Fix a case where default presentation doesn't show in breakouts
This commit is contained in:
Anton Georgiev 2021-09-14 11:03:08 -04:00 committed by GitHub
commit 45dd5811b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PageToConvert.java
View File

@ -67,6 +67,10 @@ public class PageToConvert {
return pres.getId();
}
public String getMeetingId() {
return pres.getMeetingId();
}
public PageToConvert convert() {
// Only create SWF files if the configuration requires it

5
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
View File

@ -1,13 +1,13 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
*
* Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 3.0 of the License, or (at your option) any later
* version.
*
*
* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
@ -46,6 +46,7 @@ public class PdfToSwfSlidesGenerationService {
PageConvertProgressMessage msg = new PageConvertProgressMessage(
pageToConvert.getPageNumber(),
pageToConvert.getPresId(),
pageToConvert.getMeetingId(),
new ArrayList<>());
presentationConversionCompletionService.handle(msg);
pageToConvert.getPageFile().delete();

15
bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PresentationConversionCompletionService.java
View File

@ -36,11 +36,16 @@ public class PresentationConversionCompletionService {
if (msg instanceof PresentationConvertMessage) {
PresentationConvertMessage m = (PresentationConvertMessage) msg;
PresentationToConvert p = new PresentationToConvert(m.pres);
presentationsToConvert.put(p.getKey(), p);
} else if (msg instanceof PageConvertProgressMessage) {
String presentationToConvertKey = p.getKey() + "_" + m.pres.getMeetingId();
presentationsToConvert.put(presentationToConvertKey, p);
} else if (msg instanceof PageConvertProgressMessage) {
PageConvertProgressMessage m = (PageConvertProgressMessage) msg;
PresentationToConvert p = presentationsToConvert.get(m.presId);
String presentationToConvertKey = m.presId + "_" + m.meetingId;
PresentationToConvert p = presentationsToConvert.get(presentationToConvertKey);
if (p != null) {
p.incrementPagesCompleted();
notifier.sendConversionUpdateMessage(p.getPagesCompleted(), p.pres, m.page);
@ -52,7 +57,9 @@ public class PresentationConversionCompletionService {
}
private void handleEndProcessing(PresentationToConvert p) {
presentationsToConvert.remove(p.getKey());
String presentationToConvertKey = p.getKey() + "_" + p.pres.getMeetingId();
presentationsToConvert.remove(presentationToConvertKey);
Map<String, Object> logData = new HashMap<String, Object>();
logData = new HashMap<String, Object>();

4
bbb-common-web/src/main/java/org/bigbluebutton/presentation/messages/PageConvertProgressMessage.java
View File

@ -7,9 +7,11 @@ public class PageConvertProgressMessage implements IPresentationCompletionMessag
public final String presId;
public final int page;
public final List<String> errors;
public final String meetingId;
public PageConvertProgressMessage(int page, String presId, List<String> errors) {
public PageConvertProgressMessage(int page, String presId, String meetingId, List<String> errors) {
this.presId = presId;
this.meetingId = meetingId;
this.page = page;
this.errors = errors;
}