You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/12/07 02:23:46 UTC
svn commit: r1718237 - in /openmeetings:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
branches/3.1.x/openmeetings-flash/src/main/swf/
branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeeti...
Author: solomax
Date: Mon Dec 7 01:23:45 2015
New Revision: 1718237
URL: http://svn.apache.org/viewvc?rev=1718237&view=rev
Log:
[OPENMEETINGS-1286] remote cursor works as expected
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Dec 7 01:23:45 2015
@@ -799,11 +799,11 @@ public class ScopeApplicationAdapter ext
public void setNewCursorPosition(Object item) {
try {
IConnection current = Red5.getConnectionLocal();
- Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
+ Client c = sessionManager.getClientByStreamId(current.getClient().getId(), null);
@SuppressWarnings("rawtypes")
Map cursor = (Map) item;
- cursor.put("streamPublishName", currentClient.getStreamPublishName());
+ cursor.put("publicSID", c.getStreamPublishName());
sendMessageToCurrentScope("newRed5ScreenCursor", cursor, true, false);
} catch (Exception err) {
@@ -1726,7 +1726,7 @@ public class ScopeApplicationAdapter ext
if (filter(conn)) {
continue;
}
- ((IServiceCapableConnection) conn).invoke(remoteMethodName, new Object[]{newMessage}, ScopeApplicationAdapter.this);
+ ((IServiceCapableConnection) conn).invoke(remoteMethodName, new Object[] { newMessage }, ScopeApplicationAdapter.this);
count++;
}
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Mon Dec 7 01:23:45 2015
@@ -648,6 +648,7 @@
if (canvas.screenSharingDialogContainer == null) {
canvas.screenSharingDialogContainer = new lz.screenSharingDialogContainer(canvas);
}
+ if ($debug) Debug.warn("New Screen Sharing", value);
new lz.screenSharingDialog(canvas.screenSharingDialogContainer, {initObject: value});
} else {
if ($debug) Debug.warn("Self Screen Sharing");
@@ -698,7 +699,7 @@
</method>
<!---
- change Screen Sharing farme height
+ change Screen Sharing frame height
-->
<method name="hideChatContent" args="hide">
<![CDATA[
@@ -714,6 +715,7 @@
-->
<method name="updateCursorScreenSharing" args="value">
<![CDATA[
+ //if ($debug) Debug.write("updateCursorScreenSharing ", value);
if (canvas.screenSharingDialogContainer != null) {
var obj = canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
if (obj) {
Modified: openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Mon Dec 7 01:23:45 2015
@@ -210,7 +210,7 @@ public class CoreScreenShare implements
int y = (int)(Ampl_factor * (mouseP.getY() - spinnerY) * scaleFactor);
Map<String, Object> cursorPosition = new HashMap<String, Object>();
- cursorPosition.put("publicSID", publishName);
+ cursorPosition.put("streamPublishName", publishName);
cursorPosition.put("cursor_x", x);
cursorPosition.put("cursor_y", y);
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java Mon Dec 7 01:23:45 2015
@@ -27,7 +27,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
-import static org.apache.openmeetings.web.app.WebSession.getSid;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.room.RoomBroadcaster.getClient;
import static org.apache.openmeetings.web.room.RoomPanel.PARAM_PORT;
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Dec 7 01:23:45 2015
@@ -790,11 +790,11 @@ public class ScopeApplicationAdapter ext
public void setNewCursorPosition(Object item) {
try {
IConnection current = Red5.getConnectionLocal();
- Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
+ Client c = sessionManager.getClientByStreamId(current.getClient().getId(), null);
@SuppressWarnings("rawtypes")
Map cursor = (Map) item;
- cursor.put("streamPublishName", currentClient.getStreamPublishName());
+ cursor.put("publicSID", c.getStreamPublishName());
sendMessageToCurrentScope("newRed5ScreenCursor", cursor, true, false);
} catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Mon Dec 7 01:23:45 2015
@@ -210,7 +210,7 @@ public class CoreScreenShare implements
int y = (int)(Ampl_factor * (mouseP.getY() - spinnerY) * scaleFactor);
Map<String, Object> cursorPosition = new HashMap<String, Object>();
- cursorPosition.put("publicSID", publishName);
+ cursorPosition.put("streamPublishName", publishName);
cursorPosition.put("cursor_x", x);
cursorPosition.put("cursor_y", y);
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1718237&r1=1718236&r2=1718237&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java Mon Dec 7 01:23:45 2015
@@ -27,7 +27,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
-import static org.apache.openmeetings.web.app.WebSession.getSid;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;