- send the number of slide completed instead of page number

pandreas82 · Mar 9, 2012 · d8274e0 · d8274e0
1 parent b17cf9a
commit d8274e0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...tton-web/src/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java b/...tton-web/src/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
@@ -123,14 +123,17 @@ public PdfToSwfSlide call() {
 			tasks.add(task);
 			completionService.submit(c);
 		}		
-
+
+		int slidesCompleted = 0;
+
 		for (final PdfToSwfSlide slide : slides) {
 			Future<PdfToSwfSlide> future = null;
 			try {
 				future = completionService.poll(MAXWAIT, TimeUnit.MILLISECONDS);
 				if (future != null) {
 					PdfToSwfSlide s = future.get();
-					notifier.sendConversionUpdateMessage(s.getPageNumber(), pres);
+					slidesCompleted++;
+					notifier.sendConversionUpdateMessage(slidesCompleted, pres);
 				} else {
 					log.info("Timedout waiting for page to finish conversion.");
 				}
@@ -144,8 +147,8 @@ public PdfToSwfSlide call() {
 		for (final PdfToSwfSlide slide : slides) {
 			if (! slide.isDone()){
 				log.warn("Creating blank slide for " + slide.getPageNumber());
-				slide.generateBlankSlide();
-				notifier.sendConversionUpdateMessage(slide.getPageNumber(), pres);
+				slide.generateBlankSlide();				
+				notifier.sendConversionUpdateMessage(slidesCompleted++, pres);
 			}	
 		}
 	}