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/11/22 19:58:38 UTC
svn commit: r1715678 - in /openmeetings:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/
branches/3.1.x/openmeetings-flash/src/...
Author: solomax
Date: Sun Nov 22 18:58:37 2015
New Revision: 1715678
URL: http://svn.apache.org/viewvc?rev=1715678&view=rev
Log:
[OPENMEETINGS-1279] room partially works
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
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/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java Sun Nov 22 18:58:37 2015
@@ -118,13 +118,13 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoomId();
- log.debug("room_id: " + room_id);
+ Long roomId = currentClient.getRoomId();
+ log.debug("roomId: " + roomId);
- if (room_id == null) {
+ if (roomId == null) {
return 1; //TODO weird
}
- Room room = roomDao.get(room_id);
+ Room room = roomDao.get(roomId);
@SuppressWarnings("rawtypes")
ArrayList messageMap = (ArrayList) newMessage;
// adding delimiter space, cause otherwise an emoticon in the last
@@ -137,7 +137,7 @@ public class ChatService implements IPen
newMessage = messageMap;
boolean needModeration = Boolean.valueOf("" + messageMap.get(9));
- List<HashMap<String, Object>> myChatList = myChats.get(room_id);
+ List<HashMap<String, Object>> myChatList = myChats.get(roomId);
if (myChatList == null) myChatList = new LinkedList<HashMap<String, Object>>();
HashMap<String, Object> hsm = new HashMap<String, Object>();
@@ -167,8 +167,8 @@ public class ChatService implements IPen
if (myChatList.size() == chatRoomHistory) myChatList.remove(0);
myChatList.add(hsm);
- myChats.put(room_id, myChatList);
- log.debug("SET CHATROOM: " + room_id);
+ myChats.put(roomId, myChatList);
+ log.debug("SET CHATROOM: " + roomId);
//broadcast to everybody in the room/domain
for (IConnection conn : current.getScope().getClientConnections()) {
@@ -287,14 +287,14 @@ public class ChatService implements IPen
try {
IConnection current = Red5.getConnectionLocal();
Client currentClient = this.sessionManager.getClientByStreamId(current.getClient().getId(), null);
- Long room_id = currentClient.getRoomId();
+ Long roomId = currentClient.getRoomId();
- log.debug("GET CHATROOM: " + room_id);
+ log.debug("GET CHATROOM: " + roomId);
- List<HashMap<String,Object>> myChatList = myChats.get(room_id);
+ List<HashMap<String,Object>> myChatList = myChats.get(roomId);
if (myChatList==null) myChatList = new LinkedList<HashMap<String,Object>>();
- if (Boolean.TRUE != currentClient.getIsMod() && Boolean.TRUE != currentClient.getIsSuperModerator()) {
+ if (!currentClient.getIsMod() && !currentClient.getIsSuperModerator()) {
//current user is not moderator, chat history need to be filtered
List<HashMap<String,Object>> tmpChatList = new LinkedList<HashMap<String,Object>>(myChatList);
for (int i = tmpChatList.size() - 1; i > -1; --i) {
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=1715678&r1=1715677&r2=1715678&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 Sun Nov 22 18:58:37 2015
@@ -516,7 +516,7 @@ public class ScopeApplicationAdapter ext
whiteBoardService.removeUserFromAllLists(currentScope, currentClient);
}
- log.debug("removing USername " + currentClient.getUsername() + " "
+ log.debug("removing Username " + currentClient.getUsername() + " "
+ currentClient.getConnectedSince() + " streamid: "
+ currentClient.getStreamid());
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Sun Nov 22 18:58:37 2015
@@ -183,6 +183,12 @@
this.getsessiondata.callRPC();
}
connected = true;
+ client.setNewBroadCastingFlag = this.setNewBroadCastingFlag;
+ client.roomConnect = this.roomConnect;
+ client.addNewUser = this.addNewUser;
+ client.sendVarsToMessage = this.sendVarsToMessage;
+ client.sendVarsToMessageWithClient = this.sendVarsToMessageWithClient;
+ client.sendSyncCompleteFlag = this.sendSyncCompleteFlag;
</handler>
<handler name="ondisconnect">
@@ -533,6 +539,7 @@
}
parent.getRoomById.doCall();
}
+ if ($debug) Debug.write("getCurrentRoomClient: ", canvas.currentClient);
]]>
</handler>
</netRemoteCallHib>
@@ -791,18 +798,16 @@
</netRemoteCallHib>
<!--- Notification of new User -->
- <netRemoteCallHib name="addNewUser" funcname="addNewUser">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("addNewUser: ",value);
- if(value.sipTransport) {
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
- } else {
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
- }
- canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
- </handler>
- </netRemoteCallHib>
+ <method name="addNewUser" args="value">
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("addNewUser: ",value);
+ if(value.sipTransport) {
+ canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
+ } else {
+ canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.roomId,'',value.formatedDate,value.userpos,value.usercolor,value);
+ }
+ canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
+ </method>
<netRemoteCallHib name="getCurrentModeratorList" funcname="getCurrentModeratorList">
<handler name="ondata" args="value">
@@ -1084,31 +1089,28 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="setNewBroadCastingFlag" funcname="setNewBroadCastingFlag">
- <netparam><method name="getValue">return null;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write(" onResult setNewBroadCastingFlag : ",value);
- canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID).setAttribute("refObj", value);
- if (canvas.publicSID == value.publicSID) {
- canvas.commonVideoViewContent.toggleVideo(value.canVideo);
- canvas.setAttribute("isBroadCasting", value.isBroadcasting);
- canvas.setAttribute("canVideo", value.canVideo);
-
- if ($debug) Debug.write("Its about You ", value);
- if (value.isBroadcasting) {
- if (canvas.thishib.modus == "interview") {
- canvas._drawarea.newInterviewStarting(value);
- } else {
- canvas.commonVideoViewContent.createEditRecordStream(false, false, -1);
- }
- }
- }
- canvas.setAttribute("lastBroadCastingUser",value);
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="setNewBroadCastingFlag" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write(" onResult setNewBroadCastingFlag : ",value);
+ canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID).setAttribute("refObj", value);
+ if (canvas.publicSID == value.publicSID) {
+ canvas.commonVideoViewContent.toggleVideo(value.canVideo);
+ canvas.setAttribute("isBroadCasting", value.isBroadcasting);
+ canvas.setAttribute("canVideo", value.canVideo);
+
+ if ($debug) Debug.write("Its about You ", value);
+ if (value.isBroadcasting) {
+ if (canvas.thishib.modus == "interview") {
+ canvas._drawarea.newInterviewStarting(value);
+ } else {
+ canvas.commonVideoViewContent.createEditRecordStream(false, false, -1);
+ }
+ }
+ }
+ canvas.setAttribute("lastBroadCastingUser",value);
+ ]]>
+ </method>
<netRemoteCallHib name="giveExclusiveAudio" funcname="giveExclusiveAudio">
<attribute name="publicSID" value="0" type="string" />
@@ -1298,41 +1300,39 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendVarsToMessage" funcname="sendVarsToMessage">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("sendVarsToMessage : ",value);
- if (value[0]=='audioActivity'){
- //canvas.currentModApply
- //if ($debug) Debug.write("audioActivity Client ",value[1],value[2]);
- canvas.commonVideoViewContent.setSpeakingByPos(value[2],value[1]);
- } else if (value[0]=='typingActivity'){
- if ($debug) Debug.write("!!!typingActivity ::", value[1], canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]));
- canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]).userTyping(value[1]);
- } else if (value[0]=='chat'){
- // Not Used
- //Debug.warn("Not Used");
- canvas.addChatHistory(value);
- } else if (value[0]=='activateWhiteboard'){
- // Not Used
- //Debug.warn("Not Used");
- canvas._drawarea.parent.parent.parent.activateWhiteboard(value);
- } else if (value[0]=='newWhiteboard'){
- // Not Used
- //Debug.warn("Not Used");
- canvas._drawarea.parent.parent.parent.newWhiteboard(value);
- } else if (value[0]=='removeWindow'){
- // Not Used
- //Debug.warn("Not Used");
- canvas._drawarea.parent.parent.parent.removeWindow(value);
- } else if(value[0]=='fileslist'){
- canvas.currentImagesListdraw.parent.onvisible.sendEvent(true);
- }
-
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="sendVarsToMessage" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ //Debug.write("sendVarsToMessage : ",value);
+ if (value[0]=='audioActivity'){
+ //canvas.currentModApply
+ //if ($debug) Debug.write("audioActivity Client ",value[1],value[2]);
+ canvas.commonVideoViewContent.setSpeakingByPos(value[2],value[1]);
+ } else if (value[0]=='typingActivity'){
+ if ($debug) Debug.write("!!!typingActivity ::", value[1], canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]));
+ canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]).userTyping(value[1]);
+ } else if (value[0]=='chat'){
+ // Not Used
+ //Debug.warn("Not Used");
+ canvas.addChatHistory(value);
+ } else if (value[0]=='activateWhiteboard'){
+ // Not Used
+ //Debug.warn("Not Used");
+ canvas._drawarea.parent.parent.parent.activateWhiteboard(value);
+ } else if (value[0]=='newWhiteboard'){
+ // Not Used
+ //Debug.warn("Not Used");
+ canvas._drawarea.parent.parent.parent.newWhiteboard(value);
+ } else if (value[0]=='removeWindow'){
+ // Not Used
+ //Debug.warn("Not Used");
+ canvas._drawarea.parent.parent.parent.removeWindow(value);
+ } else if(value[0]=='fileslist'){
+ canvas.currentImagesListdraw.parent.onvisible.sendEvent(true);
+ }
+ ]]>
+ </method>
+
<netRemoteCallHib name="sendVarsModeratorGeneral" funcname="sendVarsModeratorGeneral">
<netparam name="vars"><method name="getValue">return canvas.VarsModeratorGeneral;</method></netparam>
<handler name="ondata" args="value">
@@ -1387,144 +1387,134 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendVarsToMessageWithClient" funcname="sendVarsToMessageWithClient"
- remotecontext="$once{ canvas.thishib }" >
- <netparam name="vars"><method name="getValue">return parent.parent.applymessage;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("sendVarsToMessageWithClient : ",value,value.message,value.message[0]);
- if (value[0]=='kick' || value.message[0]=='kick'){
- //canvas.currentModApply
- if ($debug) Debug.write("!!!!!! THIS USER GOING TO BE KICKED");
- parent.showKickMessage = true;
- parent.disconnect();
- canvas.commonVideoViewContent.immediateExitRoom(true,null);
- } else if (value.message[0]=='copiedText'){
- //canvas.currentModApply
-
- if ($debug) Debug.info("copiedText :: ",value.message[1]);
- //System.setClipboard(value.message[1]);
- //lz.Browser.setClipboard(value.message[1]);
- //LzBrowserKernel.setClipboard (value.message[1]);
-
- //import flash.System;
- //flash.System.setClipboard(value.message[1]);
-
- new lz.copiedTextPopup(canvas,{
- error:value.message[1]
- });
-
- } else if (value.message[0]=='applyforMod'){
- //canvas.currentModApply
- if (canvas.streamid!=value.client.streamid) {
- new lz.responseForModeration(canvas.main_content._content.inner,{
- userobject:value.client,
- clientId:value.client.streamid
- });
- }
- } else if (value.message[0]=='applyModAnswer'){
- canvas.currentModApply.setUserAnswer(value);
- } else if (value.message[0]=='privatechat'){
- if ($debug) Debug.write("privatechat",value.message,value.client);
- canvas._currentChatPanel.privatechat(value.message,value.client);
- } else if (value.message[0]=='chat'){
- if (canvas._chatcontent) canvas._chatcontent.addChatHistory(value.message,value.client);
- } else if (value.message[0]=='avsettings'){
- canvas.commonVideoViewContent.setAVSettingsToClient(value.client);
- } else if (value.message[0]=='whiteboard'){
- //if (value.message[1]=='wmlloadcomplete'){
- // canvas._drawarea.sendCompleteWmlLoadedRClient(value.client);
- //} else if (value.message[1]=='wmlsynccomplete'){
- // canvas._drawarea.sendCompleteWmlSync(value.client);
- //} else
-
- if (value.message[1]=='imageloadcomplete'){
- canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
- } else if (value.message[1]=='imagesynccomplete'){
- canvas._drawarea.sendCompleteImageSync(value.client);
- } else if (value.message[1]=='imageloaderror'){
- canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
- } else if (value.message[1]=='imageloadtimeout'){
- canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
- } else if (value.message[1]=='swfloadcomplete'){
- canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
- } else if (value.message[1]=='swfsynccomplete'){
- canvas._drawarea.sendCompleteSWFSync(value.client);
- } else if (value.message[1]=='swfloaderror'){
- canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
- } else if (value.message[1]=='swfloadtimeout'){
- canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
- } else if (value.message[1]=='inituser'){
-
- //this message is deprecated and can be removed!
- //swagner 12.06.2008
- //canvas._drawarea.sendCompleteImageSync(value.client);
- if ($debug) Debug.write("inituser loadwmlObjectToStage: ",value.message[2]);
- if (!canvas.ismoderator) canvas._drawarea.loadwmlObjectToStage(value.message[2],"","","",true,true);
- } else if (value.message[1]=='initgetVars'){
- //canvas._drawarea.sendCompleteImageSync(value.client);
- //Debug.write("initgetVars sendVarsToMessageWithClient: ",value.message[2]);
- canvas._drawarea.sendWatchObject(value.message[1],value.message[2],false);
- } else if (value.message[1]=='syncinitLoader'){
- //canvas._drawarea.sendCompleteImageSync(value.client);
- //Debug.write("syncinitLoader sendVarsToMessageWithClient: ",value.message[2]);
- if (value.client.streamid!=canvas.streamid) canvas._drawarea.remoteSyncLoader();
- } else if (value.message[1][0]=='isSnapToGrid'){
- canvas._drawarea.setAttribute('isSnapToGrid', value.message[1][1]);
- //Debug.write("syncinitLoader sendVarsToMessageWithClient: ",value.message[2]);
- //if (value.client.streamid!=canvas.streamid) canvas._drawarea.remoteSyncLoader();
- }
- } else if (value.message[0]=='updateMuteStatus'){
- canvas.setMuteStatus(value.message[1]);
- } else if (value.message[0]=='updateDrawStatus'){
- canvas.setDrawAllowStatus(value.message[1]);
- //Notify all Listeners for change of the item
- canvas.setAttribute("drawAllowStatus",value.message[1]);
- } else if (value.message[0]=='updateGiveAudioStatus') {
- canvas.setExclusiveAudioAllowStatus(value.message[1]);
- canvas.setAttribute("exclusiveAudioAllowStatus",value.message[1]);
- } else if (value.message[0]=='applyForModeration'){
- if ($debug) Debug.write("Somebody wants the Moderation ",value.client);
- canvas.currentActivityList.addModerationRequest(value.client,value.message[1]);
- } else if (value.message[0]=='applyForScreen'){
- if ($debug) Debug.write("Somebody wants to share/record Screen ",value.client);
- canvas.currentActivityList.addScreenRequest(value.client,value.message[1]);
- } else if (value.message[0]=='applyForRemote'){
- if ($debug) Debug.write("Somebody wants to remote control screen ",value.client);
- canvas.currentActivityList.addRemoteRequest(value.client,value.message[1]);
- } else if (value.message[0]=='applyForWhiteboard'){
- if ($debug) Debug.write("Somebody wants to draw on Whiteboard ",value.client);
- canvas.currentActivityList.addWhiteboardRequest(value.client,value.message[1]);
- } else if (value.message[0]=='applyForA'){
- if ($debug) Debug.write("Somebody wants to share A ",value.client);
- canvas.currentActivityList.addAudioRequest(value.client,value.message[1]);
- } else if (value.message[0]=='applyForAV'){
- if ($debug) Debug.write("Somebody wants to share AV ",value.client);
- canvas.currentActivityList.addAudioAndVideoRequest(value.client,value.message[1]);
- } else if (value.message[0]=='hideActivityObj'){
- if ($debug) Debug.write("Somebody wants to hideActivityObj ",value.client);
- canvas.currentActivityList.hideActivityObj(value);
- } else if (value.message[0]=='applyForMuteOn'){
- canvas.currentActivityList.applyForMuteOn(value.client,value.message[1]);
- } else if (value.message[0]=='applyForMuteOff'){
- canvas.currentActivityList.applyForMuteOff(value.client,value.message[1]);
- } else if (value.message[0]=='applyForGiveExclusiveAudioOn'){
- canvas.currentActivityList.applyForGiveExclusiveAudioOn(value.client,value.message[1]);
- } else if (value.message[0] == 'personal') {
- var pSID = value.client.publicSID;
- var vo = canvas._videocontainer._participants.getUserListItemByPublicSID(pSID);
- if (vo != null) {
- vo.setAttribute('lastname', value.message[2]);
- vo.refObj.lastname = value.message[2];
- }
- canvas.commonVideoViewContent.updateFirstLastName(pSID, value.message[1], value.message[2]);
- } else {
- if ($debug) Debug.warn("sendVarsToMessageWithClient unkown message ",value);
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="sendVarsToMessageWithClient" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("sendVarsToMessageWithClient : ",value,value.message,value.message[0]);
+ if (value[0]=='kick' || value.message[0]=='kick') {
+ //canvas.currentModApply
+ if ($debug) Debug.write("!!!!!! THIS USER GOING TO BE KICKED");
+ parent.showKickMessage = true;
+ parent.disconnect();
+ canvas.commonVideoViewContent.immediateExitRoom(true,null);
+ } else if (value.message[0]=='copiedText'){
+ //canvas.currentModApply
+
+ if ($debug) Debug.info("copiedText :: ",value.message[1]);
+ //System.setClipboard(value.message[1]);
+ //lz.Browser.setClipboard(value.message[1]);
+ //LzBrowserKernel.setClipboard (value.message[1]);
+ //import flash.System;
+ //flash.System.setClipboard(value.message[1]);
+
+ new lz.copiedTextPopup(canvas,{error:value.message[1]});
+ } else if (value.message[0]=='applyforMod'){
+ //canvas.currentModApply
+ if (canvas.streamid!=value.client.streamid) {
+ new lz.responseForModeration(canvas.main_content._content.inner,{
+ userobject:value.client,
+ clientId:value.client.streamid
+ });
+ }
+ } else if (value.message[0]=='applyModAnswer'){
+ canvas.currentModApply.setUserAnswer(value);
+ } else if (value.message[0]=='privatechat'){
+ if ($debug) Debug.write("privatechat",value.message,value.client);
+ canvas._currentChatPanel.privatechat(value.message,value.client);
+ } else if (value.message[0]=='chat'){
+ if (canvas._chatcontent) canvas._chatcontent.addChatHistory(value.message,value.client);
+ } else if (value.message[0]=='avsettings'){
+ canvas.commonVideoViewContent.setAVSettingsToClient(value.client);
+ } else if (value.message[0]=='whiteboard'){
+ //if (value.message[1]=='wmlloadcomplete'){
+ // canvas._drawarea.sendCompleteWmlLoadedRClient(value.client);
+ //} else if (value.message[1]=='wmlsynccomplete'){
+ // canvas._drawarea.sendCompleteWmlSync(value.client);
+ //} else
+ if (value.message[1]=='imageloadcomplete'){
+ canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
+ } else if (value.message[1]=='imagesynccomplete'){
+ canvas._drawarea.sendCompleteImageSync(value.client);
+ } else if (value.message[1]=='imageloaderror'){
+ canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
+ } else if (value.message[1]=='imageloadtimeout'){
+ canvas._drawarea.sendCompleteImageLoadedRClient(value.client);
+ } else if (value.message[1]=='swfloadcomplete'){
+ canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
+ } else if (value.message[1]=='swfsynccomplete'){
+ canvas._drawarea.sendCompleteSWFSync(value.client);
+ } else if (value.message[1]=='swfloaderror'){
+ canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
+ } else if (value.message[1]=='swfloadtimeout'){
+ canvas._drawarea.sendCompleteSWFLoadedRClient(value.client);
+ } else if (value.message[1]=='inituser'){
+ //this message is deprecated and can be removed!
+ //swagner 12.06.2008
+ //canvas._drawarea.sendCompleteImageSync(value.client);
+ if ($debug) Debug.write("inituser loadwmlObjectToStage: ",value.message[2]);
+ if (!canvas.ismoderator) canvas._drawarea.loadwmlObjectToStage(value.message[2],"","","",true,true);
+ } else if (value.message[1]=='initgetVars'){
+ //canvas._drawarea.sendCompleteImageSync(value.client);
+ //Debug.write("initgetVars sendVarsToMessageWithClient: ",value.message[2]);
+ canvas._drawarea.sendWatchObject(value.message[1],value.message[2],false);
+ } else if (value.message[1]=='syncinitLoader'){
+ //canvas._drawarea.sendCompleteImageSync(value.client);
+ //Debug.write("syncinitLoader sendVarsToMessageWithClient: ",value.message[2]);
+ if (value.client.streamid!=canvas.streamid) canvas._drawarea.remoteSyncLoader();
+ } else if (value.message[1][0]=='isSnapToGrid'){
+ canvas._drawarea.setAttribute('isSnapToGrid', value.message[1][1]);
+ //Debug.write("syncinitLoader sendVarsToMessageWithClient: ",value.message[2]);
+ //if (value.client.streamid!=canvas.streamid) canvas._drawarea.remoteSyncLoader();
+ }
+ } else if (value.message[0]=='updateMuteStatus'){
+ canvas.setMuteStatus(value.message[1]);
+ } else if (value.message[0]=='updateDrawStatus'){
+ canvas.setDrawAllowStatus(value.message[1]);
+ //Notify all Listeners for change of the item
+ canvas.setAttribute("drawAllowStatus",value.message[1]);
+ } else if (value.message[0]=='updateGiveAudioStatus') {
+ canvas.setExclusiveAudioAllowStatus(value.message[1]);
+ canvas.setAttribute("exclusiveAudioAllowStatus",value.message[1]);
+ } else if (value.message[0]=='applyForModeration'){
+ if ($debug) Debug.write("Somebody wants the Moderation ",value.client);
+ canvas.currentActivityList.addModerationRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForScreen'){
+ if ($debug) Debug.write("Somebody wants to share/record Screen ",value.client);
+ canvas.currentActivityList.addScreenRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForRemote'){
+ if ($debug) Debug.write("Somebody wants to remote control screen ",value.client);
+ canvas.currentActivityList.addRemoteRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForWhiteboard'){
+ if ($debug) Debug.write("Somebody wants to draw on Whiteboard ",value.client);
+ canvas.currentActivityList.addWhiteboardRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForA'){
+ if ($debug) Debug.write("Somebody wants to share A ",value.client);
+ canvas.currentActivityList.addAudioRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForAV'){
+ if ($debug) Debug.write("Somebody wants to share AV ",value.client);
+ canvas.currentActivityList.addAudioAndVideoRequest(value.client,value.message[1]);
+ } else if (value.message[0]=='hideActivityObj'){
+ if ($debug) Debug.write("Somebody wants to hideActivityObj ",value.client);
+ canvas.currentActivityList.hideActivityObj(value);
+ } else if (value.message[0]=='applyForMuteOn'){
+ canvas.currentActivityList.applyForMuteOn(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForMuteOff'){
+ canvas.currentActivityList.applyForMuteOff(value.client,value.message[1]);
+ } else if (value.message[0]=='applyForGiveExclusiveAudioOn'){
+ canvas.currentActivityList.applyForGiveExclusiveAudioOn(value.client,value.message[1]);
+ } else if (value.message[0] == 'personal') {
+ var pSID = value.client.publicSID;
+ var vo = canvas._videocontainer._participants.getUserListItemByPublicSID(pSID);
+ if (vo != null) {
+ vo.setAttribute('lastname', value.message[2]);
+ vo.refObj.lastname = value.message[2];
+ }
+ canvas.commonVideoViewContent.updateFirstLastName(pSID, value.message[1], value.message[2]);
+ } else {
+ if ($debug) Debug.warn("sendVarsToMessageWithClient unkown message ",value);
+ }
+ ]]>
+ </method>
<netRemoteCallHib name="newMessageByRoomAndDomain" funcname="newMessageByRoomAndDomain">
<handler name="ondata" args="value">
@@ -1650,13 +1640,11 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="roomConnect" funcname="roomConnect" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("roomConnect: ",value);
- canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.username,
- '',value.formatedDate,value.userpos,value.usercolor,value);
- </handler>
- </netRemoteCallHib>
+ <method name="roomConnect" args="value">
+ if ($debug) Debug.write("roomConnect: ",value);
+ canvas._videocontainer.addItem(value.connectedSince,value.isMod,value.streamid,value.username,
+ '',value.formatedDate,value.userpos,value.usercolor,value);
+ </method>
<netRemoteCallHib name="nickNameSet" funcname="nickNameSet" >
<handler name="ondata" args="value">
@@ -1686,18 +1674,16 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendSyncCompleteFlag" funcname="sendSyncCompleteFlag">
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("sendSyncCompleteFlag: ",value);
- if (canvas.syncWindow != null) {
- canvas.syncWindow.close();
- canvas.syncWindow = null;
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <method name="sendSyncCompleteFlag" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("sendSyncCompleteFlag: ",value);
+ if (canvas.syncWindow != null) {
+ canvas.syncWindow.close();
+ canvas.syncWindow = null;
+ }
+ ]]>
+ </method>
<!-- Whiteboard Object Sync Process -->
<netRemoteCallHib name="sendObjectSyncFlag" funcname="sendObjectSyncFlag">
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx Sun Nov 22 18:58:37 2015
@@ -32,6 +32,7 @@
</switch>
<attribute name="debug" value="false" type="boolean" />
+ <attribute name="client" value="null" />
<event name="onconnect"/>
<event name="onerror"/>
@@ -59,10 +60,10 @@
this._nc.addEventListener(NetStatusEvent.NET_STATUS, _onStatus);
if($debug) Debug.write("devRtmpConnection/registerMethods()");
- var clientObj = {};
- clientObj.setId = this.setId;
+ client = {};
+ client.setId = this.setId;
- this._nc.client = clientObj;
+ this._nc.client = client;
//Register Methods
//this.registerMethods();
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=1715678&r1=1715677&r2=1715678&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 Sun Nov 22 18:58:37 2015
@@ -37,12 +37,12 @@
<attribute name="baseVideoStream" value="null" />
<method name="toggleVideo" args="value">
- if($debug) Debug.info("toggleVideo ", value);
- canvas.userobject.canVideo = value;
+ if($debug) Debug.info("toggleVideo ", canvas.currentClient, value);
+ canvas.currentClient.canVideo = value;
</method>
<method name="createEditRecordStream" args="syncUpdate,isInterview,interviewPodId">
- if($debug) Debug.info("createEditRecordStream,", syncUpdate, isInterview, interviewPodId, canvas.userobject);
+ if($debug) Debug.info("createEditRecordStream,", syncUpdate, isInterview, interviewPodId, canvas.currentClient);
if (canvas.inner.editRecordStream != null)
canvas.inner.editRecordStream.destroy();
new lz.editRecordStreamSWF10(canvas.inner, {
@@ -185,8 +185,8 @@
<![CDATA[
this.broadCastViewRef = getNewVideoObjectByPos(publicSID);
this.broadCastViewRef._chatvideoinner.r.destroy();
- if ($debug) Debug.write("getNewVideoObject canvas.userobject ",publicSID,canvas.userobject);
- this.broadCastViewRef.setAttribute('chatpartnername',canvas.userobject.firstname+' '+canvas.userobject.lastname);
+ if ($debug) Debug.write("getNewVideoObject canvas.currentClient ",publicSID, canvas.currentClient);
+ this.broadCastViewRef.setAttribute('chatpartnername', canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
return this.broadCastViewRef;
]]>
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx Sun Nov 22 18:58:37 2015
@@ -145,7 +145,7 @@
</view>
<!-- View for Conference menu bar at the top side. Visible on conference -->
-<view name="_conferencemenu" y="0" x="0" width="100%" height="20" visibility="hidden" >
+<view name="_conferencemenu" y="0" x="0" width="100%" height="20" visible="false" >
<method name="removeAll">
<![CDATA[
if($debug) Debug.write("main.lzx/_coferencemenu.removeAll(): ");
@@ -190,4 +190,6 @@
<text name="_text" align="right" y="56" fontsize="14" fgcolor="red">Loading...</text>
</view>
+<view name="inner"></view>
+
</canvas>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/globalMethods.lzx Sun Nov 22 18:58:37 2015
@@ -38,21 +38,24 @@ var lineHeight = 0;
function calcLineWidthByTextField(maxsizeText,textForCalcing,fontsize, fontname){
//check test/testLineWidth.lzx in test-directory for a detailed example calculation
- //Debug.write("calcLineWidthByTextField: ",textForCalcing);
+ //if ($debug) Debug.write("calcLineWidthByTextField: ",textForCalcing);
maxsize = maxsizeText;
startIndex = 0;
currentLine = 0;
textObject = new Array();
+ if ($debug) Debug.write("textObject", textObject);
textFieldtext = textForCalcing;
myTextFormat = new TextFormat();
myTextFormat.size = fontsize;
myTextFormat.font = fontname;
+ if ($debug) Debug.write("myTextFormat", myTextFormat);
var metrics = myTextFormat.getTextExtent(textFieldtext, 100000);
+ if ($debug) Debug.write("metrics", metrics);
lineHeight = metrics.ascent+metrics.descent;
- //Debug.write(lineHeight);
+ //if ($debug) Debug.write(lineHeight);
measureLine();
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Sun Nov 22 18:58:37 2015
@@ -91,14 +91,14 @@
}
canvas.currentBaseConferenceRoom = this;
- if (this.roomobj.hideTopBar == null || !this.roomobj.hideTopBar) {
+ if (!this.roomobj.hideTopBar) {
canvas.currentBaseConferenceRoom.createMenu();
- canvas._conferencemenu.setAttribute('visibility','visible');
} else {
- canvas.setAttribute('naviHeight',0);
- canvas._conferencemenu.setAttribute('visibility','hidden');
- canvas._mainbgcontentNavi.setAttribute('visibility','hidden');
+ canvas.setAttribute('naviHeight', 0);
+ canvas.setAttribute('naviHeightDelta', 0);
+ canvas._mainbgcontentNavi.setAttribute('visible', false);
}
+ canvas._conferencemenu.setAttribute('visible', !this.roomobj.hideTopBar);
if ($debug) Debug.write("this.roomobj ",this.roomobj);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Sun Nov 22 18:58:37 2015
@@ -22,6 +22,7 @@
<class name="flexibleConferenceRoom" extends="baseConferenceRoom">
<method name="createMenu">
+ if ($debug) Debug.write("flexibleConferenceRoom:: createMenu");
new lz.conferenceMenubar(canvas._conferencemenu);
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Sun Nov 22 18:58:37 2015
@@ -21,9 +21,6 @@
<library>
<class name="restrictedConferenceRoom" extends="baseConferenceRoom">
- <handler name="oninit">
- if ($debug) Debug.write("restrictedConferenceRoom::oninit ");
- </handler>
<method name="createMenu">
new lz.restrictedConferenceMenubar(canvas._conferencemenu);
</method>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantList.lzx Sun Nov 22 18:58:37 2015
@@ -39,30 +39,6 @@
<view width="$once{ parent.width-2 }" height="${ parent.height-2 }"
x="1" y="1" bgcolor="0xFFFFFF" />
- <handler name="oninit">
- <![CDATA[
- var items = this._table.innerList.subnodes;
- canvas.videoComp_lc.lc_setSoundMuted = function(publicSID,isMuted) {
- if ($debug) Debug.write("lc_setSoundMuted: publicSID, isMuted",publicSID, isMuted);
-
- for (var i=1; i<items.length; i++) {
- var listItem = items[i];
- if (listItem.refObj.publicSID == publicSID) {
- var muteView = listItem._miniIcons._mute;
- if (isMuted) {
- muteView.setAttribute('frame', 2);
- muteView._tip.setAttribute('labelid', 1075);
- } else {
- muteView.setAttribute('frame', 1);
- muteView._tip.setAttribute('labelid', 1074);
- }
- break;
- }
- }
- };
- ]]>
- </handler>
-
<method name="addItem" args="object">
<![CDATA[
if ($debug) Debug.write("participantList addItem: ",object,object.publicSID);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatOutput.lzx Sun Nov 22 18:58:37 2015
@@ -60,49 +60,31 @@
</handler>
</netRemoteCallHib>
- <method name="getLog">
- <![CDATA[
- var tString = "";
-
- for (var i=0;i<this._cbtext.subviews.length;i++) {
-
- if (i!=0) {
- tString += "<br/>";
- }
-
- tString += this._cbtext.subviews[i].username + ': '
- + this._cbtext.subviews[i].message;
-
- }
-
- return tString;
-
- ]]>
- </method>
+ <method name="getLog">
+ <![CDATA[
+ var tString = "";
+ for (var i = 0; i < this._cbtext.subviews.length; ++i) {
+ if (i != 0) {
+ tString += "<br/>";
+ }
+ tString += this._cbtext.subviews[i].username + ': ' + this._cbtext.subviews[i].message;
+ }
+ return tString;
+ ]]>
+ </method>
<method name="addChatHistory" args="value,client">
<![CDATA[
- if($debug) Debug.write("chatOutput/addChatHistory: ",value,client);
+ if($debug) Debug.write("chatOutput/addChatHistory: ", value, client);
canvas.currentBaseConferenceRoom._chatPanelStrict.startBlink();
var username = (client.firstname == null ? "" : client.firstname) + " " + (client.lastname == null ? "" : client.lastname);
var messageObj = value[value.length - 1];
var usercolor = value[5];
- var isDirectLink = null;
- if (value[8] > 0) {
- isDirectLink = false;
- } else {
- isDirectLink = true;
- }
+ var isDirectLink = canvas.isRemoteUser() || value[8] <= 0;
+ if (usercolor == null || usercolor == 0 || (usercolor != null && ("" + usercolor).length == 0)) usercolor = 0xCCCCCC;
- if (canvas.isRemoteUser()) {
- isDirectLink = true;
- }
- if ( usercolor==null || usercolor==0 || (usercolor !=null && usercolor.length==0) )usercolor=0xCCCCCC;
-
-
-
- if ($debug) Debug.write("addChatHistory userID: ",value[8],isDirectLink);
+ if ($debug) Debug.write("addChatHistory userID: ", value[8], isDirectLink);
new lz.chatTabItemEmoticons(this._cbtext,{
rawMessage: value,
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabBottom.lzx Sun Nov 22 18:58:37 2015
@@ -67,7 +67,7 @@
om[5] = canvas.currentusercolor;
om[6] = parent.parent.isPrivate ? parent.parent.parent.refObj.publicSID : canvas.publicSID;
om[7] = canvas.isrtl;
- om[8] = hib.userobject.userId;
+ om[8] = hib.userobject.id;
om[9] = canvas.currentRoomObj.chatModerated && !canvas.ismoderator;
if ($debug) Debug.write("send: ", parent.parent.parent);
if (parent.parent.isPrivate) {
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Sun Nov 22 18:58:37 2015
@@ -114,87 +114,84 @@
opacity="0.3" bgcolor="0xFFFFFF">
</view>
- <text multiline="true" x="180" width="$once{ parent.width - 306 }" fontsize="11" selectable="true" name="multi" >
+ <text multiline="true" x="180" width="$once{ parent.width - 306 }" fontsize="11" selectable="true" name="multi" direction="$once{ canvas.isrtl ? 'rtl' : 'ltr' }">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.text.*;
+ </passthrough>
+ </when>
+ </switch>
<handler name="oninit">
- <![CDATA[
- /* FIXME TODO as2->3 migration
- if(canvas.isrtl!='true'){
- this.sprite.__LZtextclip.wordWrap = false;
- if($debug) Debug.write("New Text");
- //Debug.write(this.sprite.getTextFormat());
- var tFormat = getTextFormat();
- //Debug.write(this.sprite.__LZtextclip.getTextFormat());
- tFormat.leading = 4;
- setTextFormat(tFormat);
- var items = parent.messageObj;
- var t = "";
- //items[0] = ["text","hello your are the hero lets check accomodation today i need some input"];
- for (var i=0;i<items.length;i++) {
-
- //if ($debug) Debug.write("Item :0: ",items[i][0]);
-
- if (items[i][0]=="text"){
- //if ($debug) Debug.write("Text :1: ",items[i][1]);
-
- t += items[i][1];
+ <![CDATA[
+ var tf:TextField = this.sprite['textfield'];
+ if ($debug) Debug.write("New Text ", this, tf, tf.wordWrap, tf.getTextFormat());
+ if (!canvas.isrtl) {
+ tf.wordWrap = false;
+ var tFormat:TextFormat = tf.getTextFormat();
+ //if ($debug) Debug.write(tFormat);
+ tFormat.leading = 4;
+ tf.setTextFormat(tFormat);
+ var items = parent.messageObj;
+ var t = "";
+ //items[0] = ["text","hello your are the hero lets check accomodation today i need some input"];
+ for (var i = 0; i < items.length; ++i) {
+ //if ($debug) Debug.write("Item :0: ",items[i][0]);
+ if (items[i][0] == "text") {
+ //if ($debug) Debug.write("Text :1: ",items[i][1]);
+ t += items[i][1];
+ } else {
+ if (t.length != 0) {
+ var tempString = calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
+ var x = tempString[tempString.length-1]["lineWidth"];
+ var y = (tempString.length-1)*(getLineHeight()+parent.leading-1);
} else {
- if (t.length!=0){
- var tempString = calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
- var x = tempString[tempString.length-1]["lineWidth"];
- var y = (tempString.length-1)*(getLineHeight()+parent.leading-1);
- }else {
- var x = 0;
- var y = 0;
- }
- t += items[i][2];
-
- var swfurl = canvas.getUrl() + 'public/emoticons/'+items[i][1];
- var m = new lz.chatInnerSmily(parent,{x:x+this.x,y:y+this.y,iconlabel:items[i][3]});
-
- //if ($debug) Debug.write("Smily :2: ",swfurl);
-
- m.setSource(swfurl);
+ var x = 0;
+ var y = 0;
}
+ t += items[i][2];
+
+ var swfurl = canvas.getUrl() + 'public/emoticons/'+items[i][1];
+ var m = new lz.chatInnerSmily(parent,{x:x+this.x,y:y+this.y,iconlabel:items[i][3]});
+
+ //if ($debug) Debug.write("Smily :2: ",swfurl);
+
+ m.setSource(swfurl);
}
- //Debug.write("TTTT: ",t);"Verdana"
- var tString = calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
-
- for (var k = 0;k<tString.length;k++){
- this.setAttribute('text',this.getText()+textObject[k]["text"]+"\r");
- //if ($debug) Debug.write("text: ",k,textObject[k]["lineWidth"],textObject[k]["text"]);
- }
-
- //if ($debug) Debug.write("text: ",this.getText());
-
- //Debug.write(this.getTextFormat());
- tFormat.leading = parent.leading;
- setTextFormat(tFormat);
- //Debug.write(this.textHeight);
- //Debug.write(getLineHeight());
- //Debug.write(this.textHeight+12);
- this.setAttribute('height',this.textHeight+12);
}
- else{
- var t = "";
- var items = parent.messageObj;
-
- for (var i=0;i<items.length;i++) {
- if (items[i][0]=="text"){
- t += items[i][1];
- }
- }
-
- this.setAttribute('text',this.getText()+ t);
+ //Debug.write("TTTT: ",t);"Verdana"
+ var tString = calcLineWidthByTextField(this.width, t,this.fontsize,this.font);
+
+ for (var k = 0; k < tString.length; ++k) {
+ this.setAttribute('text',this.getText()+textObject[k]["text"]+"\r");
+ //if ($debug) Debug.write("text: ",k,textObject[k]["lineWidth"],textObject[k]["text"]);
}
- */
- parent.setAttribute('height',this.height);
- parent.header_user.setAttribute('height',this.height);
- parent.bg.setAttribute('height',this.height-1);
- parent.bg_main.setAttribute('height',this.height-1);
- ]]>
- </handler>
-
+ //if ($debug) Debug.write("text: ",this.getText());
+ //Debug.write(tFormat);
+ tFormat.leading = parent.leading;
+ tf.setTextFormat(tFormat);
+ //Debug.write(this.textHeight);
+ //Debug.write(getLineHeight());
+ //Debug.write(this.textHeight+12);
+ this.setAttribute('height',this.textHeight+12);
+ } else {
+ var t = "";
+ var items = parent.messageObj;
+
+ for (var i = 0; i < items.length; ++i) {
+ if (items[i][0] == "text") {
+ t += items[i][1];
+ }
+ }
+ this.setAttribute('text',this.getText()+ t);
+ }
+ parent.setAttribute('height',this.height);
+ parent.header_user.setAttribute('height',this.height);
+ parent.bg.setAttribute('height',this.height-1);
+ parent.bg_main.setAttribute('height',this.height-1);
+ ]]>
+ </handler>
</text>
<state applied="$once{ !parent.isDirectLink }">
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Sun Nov 22 18:58:37 2015
@@ -96,11 +96,7 @@
</netRemoteCallHib>
<method name="setRoomValues">
- if (canvas.thishib.currentInvitation.room.type == 'conference'){
- canvas.isConference = true;
- } else {
- canvas.isConference = false;
- }
+ canvas.isConference = canvas.thishib.currentInvitation.room.type == 'conference';
var roomObj = canvas.thishib.currentInvitation.room;
hib.currentroomid = roomObj.id;
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Sun Nov 22 18:58:37 2015
@@ -117,8 +117,6 @@
if ($debug) Debug.write("this.myvideocontainer ",this.myvideocontainer);
if ($debug) Debug.write("editrecordstream ###################### ");
- canvas.videoComp_lc.client = {clb_getBroadCastId: this.clb_getBroadCastId, clb_setUserAVSettings: this.clb_setUserAVSettings};
-
var sharedData = this.checkDeviceSettingsRememberStatus();
if(sharedData != null) {
this.chosenCam = sharedData["cam"];
@@ -186,7 +184,7 @@
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
- parent.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, parent.interviewPodId, canvas.userobject);
+ parent.myvideocontainer = canvas._videoComponent.createVideoObject(canvas.publicSID, true, parent.interviewPodId, canvas.currentClient);
if ($debug) Debug.write("parent.setUserAVSettings -1- ",parent.chosenSetting);
if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
@@ -317,9 +315,7 @@
case "av":
videoview.broadcast(this.currentClient.broadCastID,_camera,_micro);
this.myvideocontainer.setAttribute("visible", true);
- if(canvas.isInterview) {
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
- } else {
+ if(!canvas.isInterview) {
if (this.myvideocontainer.minimized) {
this.myvideocontainer.reminimize();
}
@@ -328,9 +324,7 @@
case "a":
videoview.broadcast(this.currentClient.broadCastID,null,_micro);
this.myvideocontainer.setAttribute("visible", canvas.isInterview || !this.myvideocontainer.hidebyAudioOnly);
- if(canvas.isInterview) {
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
- } else {
+ if(!canvas.isInterview) {
if (!this.myvideocontainer.hidebyAudioOnly) {
if (!this.myvideocontainer.minimized) {
this.myvideocontainer.minimize();
@@ -341,9 +335,7 @@
case "v":
videoview.broadcast(this.currentClient.broadCastID,_camera,null);
this.myvideocontainer.setAttribute("visible", true);
- if(canvas.isInterview) {
- canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
- } else {
+ if(!canvas.isInterview) {
if (this.myvideocontainer.minimized) {
this.myvideocontainer.reminimize();
}
@@ -522,7 +514,7 @@
selectListItem(availableMics, foundStoredMic, mics.length > 0);
// settings
- var addCams = canvas.userobject.canVideo && !canvas.currentRoomObj.audioOnly && cameras.length > 0;
+ var addCams = canvas.currentClient.canVideo && !canvas.currentRoomObj.audioOnly && cameras.length > 0;
var addMics = mics.length > 0;
if (addCams && addMics) {
availableSettings.addItem(canvas.getLabelName(448), "av");
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml Sun Nov 22 18:58:37 2015
@@ -271,38 +271,4 @@ To disable AEC please specify 0.
<resolution type="nHD 16:9" width="640" height="360" isDefault="false" />
<resolution type="16:9" width="1024" height="600" isDefault="false" />
</availableCameraResolutions>
-
-
-<!-- Module Configuration -->
-<!-- #############################################
- Moderator Modules
- -->
-
-<moderatorModuleUser>userModerate</moderatorModuleUser>
-
-<moderatorModuleRoom>roomModerate</moderatorModuleRoom>
-
-
-<!-- #############################################
- Conference Room
-
- Room Layout's: flexibleConferenceRoom,conferenceView
- -->
-
-<conferenceRoomModule>flexibleConferenceRoom</conferenceRoomModule>
-
-<!-- #############################################
- Event Room
-
- Room Layouts: flexibleRestrictedConferenceRoom,restrictedConferenceRoom
- -->
-<restrictedRoomModule>restrictedConferenceRoom</restrictedRoomModule>
-
-<!-- #############################################
- Interview Room
-
- Room Layouts: interviewConferenceRoom
- -->
-<interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
-
</config>
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd?rev=1715678&r1=1715677&r2=1715678&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd Sun Nov 22 18:58:37 2015
@@ -51,11 +51,6 @@
<xs:element ref="defaultWhiteboardWidth"/>
<xs:element ref="defaultWhiteboardHeight"/>
<xs:element ref="availableCameraResolutions"/>
- <xs:element ref="moderatorModuleUser"/>
- <xs:element ref="moderatorModuleRoom"/>
- <xs:element ref="conferenceRoomModule"/>
- <xs:element ref="restrictedRoomModule"/>
- <xs:element ref="interviewRoomModule"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -143,9 +138,4 @@
<xs:attribute name="width" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
- <xs:element name="moderatorModuleUser" type="xs:NCName"/>
- <xs:element name="moderatorModuleRoom" type="xs:NCName"/>
- <xs:element name="conferenceRoomModule" type="xs:NCName"/>
- <xs:element name="restrictedRoomModule" type="xs:NCName"/>
- <xs:element name="interviewRoomModule" type="xs:NCName"/>
</xs:schema>
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=1715678&r1=1715677&r2=1715678&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 Sun Nov 22 18:58:37 2015
@@ -507,7 +507,7 @@ public class ScopeApplicationAdapter ext
whiteBoardService.removeUserFromAllLists(currentScope, currentClient);
}
- log.debug("removing USername " + currentClient.getUsername() + " "
+ log.debug("removing Username " + currentClient.getUsername() + " "
+ currentClient.getConnectedSince() + " streamid: "
+ currentClient.getStreamid());