- presenter settings are rounded off which screws up presentation sy…

…nching. Change Long to Double.
123it · Oct 28, 2010 · ca27def · ca27def
1 parent 4c7b055
commit ca27def
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/...ain/java/org/bigbluebutton/conference/service/presentation/IPresentationRoomListener.java b/...ain/java/org/bigbluebutton/conference/service/presentation/IPresentationRoomListener.java
@@ -30,7 +30,7 @@ interface IPresentationRoomListener {
 	@SuppressWarnings("unchecked")
 	public void assignPresenter(ArrayList presenter);
 	public void gotoSlide(int curslide);
-	public void resizeAndMoveSlide(Long xOffset,Long yOffset,Long widthRatio,Long heightRatio);
+	public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio);
 	public void removePresentation(String name);
 	public void sharePresentation(String presentationName, Boolean share);
 }
diff --git a/.../main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java b/.../main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
@@ -124,7 +124,7 @@ public Boolean getSharingPresentation(String room){
 		return null;
 	}
 
-	public void resizeAndMoveSlide(String room, Long xOffset,Long yOffset,Long widthRatio,Long heightRatio) {
+	public void resizeAndMoveSlide(String room, Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) {
 		if (roomsManager.hasRoom(room)){
 			log.debug("Request to resize and move slide["+xOffset+","+yOffset+","+widthRatio+","+heightRatio+"]");
 			roomsManager.resizeAndMoveSlide(room, xOffset, yOffset, widthRatio, heightRatio);

diff --git a/...ain/java/org/bigbluebutton/conference/service/presentation/PresentationEventRecorder.java b/...ain/java/org/bigbluebutton/conference/service/presentation/PresentationEventRecorder.java
@@ -174,8 +174,7 @@ public void assignPresenter(ArrayList presenter) {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void resizeAndMoveSlide(Long xOffset, Long yOffset, Long widthRatio,
-			Long heightRatio) {
+	public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) {
 		log.debug("calling moveCallback["+xOffset+","+yOffset+","+widthRatio+","+heightRatio+"]");
 		ArrayList list=new ArrayList();
 		list.add(xOffset);

diff --git a/...pps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java b/...pps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java
@@ -44,10 +44,10 @@ public class PresentationRoom {
 	int currentSlide = 0;
 	Boolean sharing = false;
 	String currentPresentation = "";
-	long xOffset = 0;
-	long yOffset = 0;
-	long widthRatio = 0;
-	long heightRatio = 0;
+	Double xOffset = 0D;
+	Double yOffset = 0D;
+	Double widthRatio = 0D;
+	Double heightRatio = 0D;
 	ArrayList<String> presentationNames = new ArrayList<String>();
 
 	public PresentationRoom(String name) {
@@ -94,7 +94,7 @@ private void storePresentationNames(Map message){
         }           
     }
 
-	public void resizeAndMoveSlide(Long xOffset, Long yOffset, Long widthRatio, Long heightRatio) {
+	public void resizeAndMoveSlide(Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) {
 		this.xOffset = xOffset;
 		this.yOffset = yOffset;
 		this.widthRatio = widthRatio;
@@ -191,19 +191,19 @@ public ArrayList getCurrentPresenter() {
 		return currentPresenter;
 	}
 
-	public long getxOffset() {
+	public Double getxOffset() {
 		return xOffset;
 	}
 
-	public long getyOffset() {
+	public Double getyOffset() {
 		return yOffset;
 	}
 
-	public long getWidthRatio() {
+	public Double getWidthRatio() {
 		return widthRatio;
 	}
 
-	public long getHeightRatio() {
+	public Double getHeightRatio() {
 		return heightRatio;
 	}
 }

diff --git a/...main/java/org/bigbluebutton/conference/service/presentation/PresentationRoomsManager.java b/...main/java/org/bigbluebutton/conference/service/presentation/PresentationRoomsManager.java
@@ -137,7 +137,7 @@ public Map getPresenterSettings(String room){
 		return null;
 	}
 
-	public void resizeAndMoveSlide(String room, Long xOffset, Long yOffset, Long widthRatio, Long heightRatio) {
+	public void resizeAndMoveSlide(String room, Double xOffset, Double yOffset, Double widthRatio, Double heightRatio) {
 		PresentationRoom r = getRoom(room);
 		if (r != null){
 			log.debug("Request to resize and move slide["+xOffset+","+yOffset+","+widthRatio+","+heightRatio+"]");

diff --git a/.../src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java b/.../src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
@@ -120,7 +120,7 @@ public void sharePresentation(String presentationName, Boolean share) {
 		presentationApplication.sharePresentation(scope.getName(), presentationName, share);
 	}
 
-	public void resizeAndMoveSlide(Long xOffset,Long yOffset,Long widthRatio,Long heightRatio) {
+	public void resizeAndMoveSlide(Double xOffset,Double yOffset,Double widthRatio,Double heightRatio) {
 		log.debug("Request to resize and move slide["+xOffset+","+yOffset+","+widthRatio+","+heightRatio);
 		IScope scope = Red5.getConnectionLocal().getScope();
 		presentationApplication.resizeAndMoveSlide(scope.getName(), xOffset, yOffset, widthRatio, heightRatio);