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">
<