Author: sebawagner
Date: Wed Feb 22 17:56:01 2012
New Revision: 1292423
URL: http://svn.apache.org/viewvc?rev=1292423&view=rev
Log:
OPENMEETINGS-61 Basic modifications to use new Audio/Video components for
playback of screen sharing in client
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/basePropertySelector.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/resources/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/resources/arrow_down_slider.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/vslider.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/screenSharingDialog.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/videoObjectPlayScreenShare.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Wed Feb 22 17:56:01 2012
@@ -1014,7 +1014,8 @@
}
}
}
- parent.checkSharingSession.doCall();
+ //@deprecated call to old screensharing implementation
+ //parent.checkSharingSession.doCall();
]]>
</handler>
</netRemoteCallHib>
@@ -1036,14 +1037,7 @@
if ($debug) Debug.write("**** closeStream: ",value);
if (value.isScreenClient) {
if ($debug) Debug.write(" onResult stopRed5ScreenSharing :
",value.streamPublishName);
-
- if (canvas.screenSharingDialogContainer != null) {
- var obj =
canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
- if (obj) {
- obj.doClose();
- }
- }
-
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeScreenSharing(value);
} else {
//free the VideoContainer
//canvas._videocontainer.closeStreamClient(value.publicSID);
@@ -1054,16 +1048,15 @@
</handler>
</netRemoteCallHib>
+ <!---
+ Event is invoked if a red5 stream sharing is closed
+ -->
<netRemoteCallHib name="stopRed5ScreenSharing"
funcname="stopRed5ScreenSharing">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("**** closeStream: ",value);
if ($debug) Debug.write(" onResult stopRed5ScreenSharing :
",value.streamPublishName);
-
- if (canvas.screenSharingDialogContainer != null) {
- var obj =
canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
- obj.doClose();
- }
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeScreenSharing(value);
</handler>
</netRemoteCallHib>
@@ -1348,11 +1341,8 @@
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- //if ($debug) Debug.write(" onResult newRed5ScreenCursor :
",value);
- if (canvas.screenSharingDialogContainer != null) {
- var obj =
canvas.screenSharingDialogContainer.searchForSession(value.streamPublishName);
- obj.updateCursor(value.cursor_x,value.cursor_y);
- }
+ //if ($debug) Debug.write(" onResult newRed5ScreenCursor :
",value);
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.updateCursorScreenSharing(value);
]]>
</handler>
</netRemoteCallHib>
@@ -1371,20 +1361,10 @@
//if ($debug) Debug.write(" onResult newRed5ScreenSharing
1 : ",value);
//if ($debug) Debug.write(" onResult newRed5ScreenSharing
2 : ",value.streamid);
//if ($debug) Debug.write(" onResult newRed5ScreenSharing
3 : ",canvas.streamid);
-
if ($debug) Debug.write(" onResult newRed5ScreenSharing 4
: ",value.streamPublishName);
if ($debug) Debug.write(" onResult newRed5ScreenSharing 5
: ",canvas.publicSID);
- if (value.streamPublishName != canvas.publicSID) {
- if (canvas.screenSharingDialogContainer == null) {
- canvas.screenSharingDialogContainer = new
lz.screenSharingDialogContainer(canvas);
- }
- new
lz.screenSharingDialog(canvas.screenSharingDialogContainer,{
- initObject:value
- });
- } else {
- if ($debug) Debug.warn("Self Screen Sharing");
- }
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharing(value);
]]>
</handler>
</netRemoteCallHib>
@@ -1394,17 +1374,11 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write(" onResult checkRed5ScreenSharing
: ",value);
-
if (value != null) {
-
- for (var eg in value) {
-
parent.newRed5ScreenSharing.ondata.sendEvent(value[eg]);
- }
-
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.newScreenSharings(value);
} else {
if ($debug) Debug.warn("Self Screen Sharing");
}
-
]]>
</handler>
</netRemoteCallHib>
@@ -2010,8 +1984,8 @@
</netRemoteCallHib>
<!-- ###########################
- New Screen Sharing Methods
- -->
+ New Screen Sharing Methods
+ @deprecated
<netRemoteCallHib name="newScreenSharing" funcname="newScreenSharing">
<handler name="ondata" args="value">
<![CDATA[
@@ -2029,8 +2003,8 @@
</handler>
</netRemoteCallHib>
- <!-- newScreenCursorPosition
- -->
+ newScreenCursorPosition
+ @deprecated
<netRemoteCallHib name="newScreenCursorPosition"
funcname="newScreenCursorPosition">
<handler name="ondata" args="value">
<![CDATA[
@@ -2044,6 +2018,7 @@
</handler>
</netRemoteCallHib>
+ @deprecated
<netRemoteCallHib name="newScreenFrame" funcname="newScreenFrame">
<handler name="ondata" args="value">
<![CDATA[
@@ -2058,6 +2033,7 @@
</handler>
</netRemoteCallHib>
+ @deprecated
<netRemoteCallHib name="checkSharingSession"
funcname="checkSharingSession">
<handler name="ondata" args="value">
<![CDATA[
@@ -2072,6 +2048,7 @@
]]>
</handler>
</netRemoteCallHib>
+ -->
<!-- Recording of Meetings -->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Wed Feb 22 17:56:01 2012
@@ -376,8 +376,6 @@ and some more references to temp-objects
<attribute name="currentRoomObject" value="null"/>
-<attribute name="screenSharingDialogContainer" value="null"/>
-
<attribute name="appointmentNotificationPopUp" value="null"/>
<attribute name="conferenceBrowserIsinited" value="false" type="boolean" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Wed Feb
22 17:56:01 2012
@@ -18,7 +18,7 @@
under the License.
-->
-<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
+<canvas width="100%" height="100%" title="OpenMeetings">
<!--
If you use maindebug.lzx, main.lzx with debug=true is loaded.
@@ -185,7 +185,4 @@
<text name="_text" align="right" y="56" fontsize="14"
fgcolor="red">Loading...</text>
</view>
-<screenSharingContainer name="_screens" />
-
-
</canvas>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Wed
Feb 22 17:56:01 2012
@@ -186,7 +186,4 @@
<text name="_text" align="right" y="56" fontsize="14"
fgcolor="red">Loading...</text>
</view>
-<screenSharingContainer name="_screens" />
-
-
</canvas>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
Wed Feb 22 17:56:01 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-<class name="commonVideoComponentAdapter" extends="view">
+<class name="commonVideoComponentAdapter" extends="node">
<handler name="oninit">
var t = this;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Wed Feb 22 17:56:01 2012
@@ -61,9 +61,7 @@
labeliderror:790,showCheckBox:false});
</handler>
<method name="sendConfirmation" args="confirm,bool">
- if (canvas.screenSharingDialogContainer != null) {
- canvas.screenSharingDialogContainer.destroy();
- }
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
if (canvas.appointmentNotificationPopUp != null) {
canvas.appointmentNotificationPopUp.destroy();
}
@@ -210,9 +208,7 @@
labeliderror:790,showCheckBox:false});
</handler>
<method name="sendConfirmation" args="confirm,bool">
- if (canvas.screenSharingDialogContainer != null) {
- canvas.screenSharingDialogContainer.destroy();
- }
+
canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
if (canvas.appointmentNotificationPopUp != null) {
canvas.appointmentNotificationPopUp.destroy();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Wed Feb 22 17:56:01 2012
@@ -177,6 +177,8 @@
}
</handler>
+ <screenSharingAdapter name="_screenSharingAdapter" />
+
</class>
</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Wed Feb 22 17:56:01 2012
@@ -65,6 +65,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
+ this._screenSharingAdapter.closeAllScreenSharings();
+
canvas.currentBaseConferenceRoom = null;
//reset the right to draw on WHiteboard as the RoomClient Object will
be destroyed also
@@ -100,7 +102,8 @@
canvas.currentActivityList = null;
}
- canvas._screens.clearAllSessions();
+ //@deprecated we will not use old screen sharing implementation
+ //canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
if ($debug) Debug.write("############ this.logicalRoomLeave
",this.logicalRoomLeave);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Wed Feb 22 17:56:01 2012
@@ -65,6 +65,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
+ this._screenSharingAdapter.closeAllScreenSharings();
+
canvas.currentBaseConferenceRoom = null;
//reset the right to draw on WHiteboard as the RoomClient Object will
be destroyed also
@@ -100,7 +102,8 @@
canvas.currentActivityList = null;
}
- canvas._screens.clearAllSessions();
+ //@deprecated we will not use old screen sharing implementation
+ //canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
if ($debug) Debug.write("############ this.logicalRoomLeave
",this.logicalRoomLeave);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Wed Feb 22 17:56:01 2012
@@ -58,6 +58,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
+ this._screenSharingAdapter.closeAllScreenSharings();
+
canvas.currentBaseConferenceRoom = null;
//reset the right to draw on WHiteboard as the RoomClient Object will
be destroyed also
@@ -93,7 +95,8 @@
canvas.currentActivityList = null;
}
- canvas._screens.clearAllSessions();
+ //@deprecated we will not use old screen sharing implementation
+ //canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
if ($debug) Debug.write("############ this.logicalRoomLeave
",this.logicalRoomLeave);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Wed Feb 22 17:56:01 2012
@@ -60,6 +60,8 @@
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
+ this._screenSharingAdapter.closeAllScreenSharings();
+
canvas.currentBaseConferenceRoom = null;
//reset the right to draw on WHiteboard as the RoomClient Object will
be destroyed also
@@ -95,7 +97,8 @@
canvas.currentActivityList = null;
}
- canvas._screens.clearAllSessions();
+ //@deprecated we will not use old screen sharing implementation
+ //canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
if ($debug) Debug.write("############ this.logicalRoomLeave
",this.logicalRoomLeave);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
Wed Feb 22 17:56:01 2012
@@ -21,6 +21,7 @@
<library>
<include href="commonVideoViewContent.lzx"/>
<include href="commonVideoComponentAdapter.lzx"/>
+ <include href="screenSharingAdapter.lzx" />
<include href="whiteboard/" />
<include href="tabbar/" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/screenSharingAdapter.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="screenSharingAdapter" extends="node">
+
+ <!---
+ Send via LocalConnection to SWF10 container
+ to show a new screen sharing video
+ @param rcl RoomClient Object
+ -->
+ <method name="newScreenSharing" args="rcl">
+ //Send via LocalConnection to SWF10 container
+ canvas.lc.send(canvas.rtmp_lc_name, "newScreenSharing", rcl);
+ </method>
+
+ <!---
+ Send via LocalConnection to SWF10 container
+ to show multiple new screen sharing video
+ @param rcl RoomClient Object Map/list
+ -->
+ <method name="newScreenSharings" args="rcls">
+ //Send via LocalConnection to SWF10 container
+ canvas.lc.send(canvas.rtmp_lc_name, "newScreenSharings", rcls);
+ </method>
+
+ <!---
+ Send via LocalConnection to SWF10 container
+ to close a single screen sharing session
+ @param rcl RoomClient Object
+ -->
+ <method name="closeScreenSharing" args="rcl">
+ //Send via LocalConnection to SWF10 container
+ canvas.lc.send(canvas.rtmp_lc_name, "closeScreenSharing", rcl);
+ </method>
+
+ <!---
+ Send via LocalConnection to SWF10 container
+ to close all screen sharing viewer videos
+ -->
+ <method name="closeAllScreenSharings" >
+ //Send via LocalConnection to SWF10 container
+ canvas.lc.send(canvas.rtmp_lc_name, "closeAllScreenSharings");
+ </method>
+
+ <!---
+ Send via LocalConnection to SWF10 container
+ to update the mouse position of a certain screen sharing
+ @param cursorMap Map Object
+ -->
+ <method name="updateCursorScreenSharing" args="cursorMap">
+ //Send via LocalConnection to SWF10 container
+ canvas.lc.send(canvas.rtmp_lc_name,
"updateCursorScreenSharing",cursorMap);
+ </method>
+
+</class>
+
+</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
Wed Feb 22 17:56:01 2012
@@ -34,7 +34,9 @@
<!-- -->
<include href="meetings/" />
+ <!--
<include href="recording/" />
+ -->
<include href="admin/" />
@@ -42,8 +44,10 @@
<include href="calendar/" />
-->
+ <!--
<include href="sharing/" />
<include href="screenSharer2/" />
+ -->
<include href="sipintegration/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/library.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/library.lzx
Wed Feb 22 17:56:01 2012
@@ -6,6 +6,7 @@
<include href="labelCheckbox.lzx" />
<include href="text/" />
+ <include href="lps/" />
<include href="button/" />
<include href="explorer/" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/basePropertySelector.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/basePropertySelector.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/basePropertySelector.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/basePropertySelector.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,48 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="hidePropertyView" extends="view"
+ width="$once{ parent.width }" height="$once{ parent.height }"
+ opacity="0.7" bgcolor="0xFFFFFF" />
+
+<class name="basePropertySelector" extends="view">
+
+ <!--- position of the SliderWin or ColorPicker -->
+ <attribute name="boxPosition" value="down" type="string" />
+
+ <attribute name="isEnabled" value="true" type="boolean" />
+ <attribute name="enabledView" value="null" />
+
+ <method name="setEnabled" args="b">
+ this.setAttribute('isEnabled',b);
+ if (this.enabledView != null) {
+ this.enabledView.destroy();
+ this.enabledView = null;
+ }
+ if (!b) {
+ this.enabledView = new lz.hidePropertyView(this);
+ }
+ </method>
+
+
+</class>
+
+</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/changeWidthSlider.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="changeWidthSlider" extends="basePropertySelector"
bgcolor="0xFFFFFF" width="60" height="24">
+
+ <attribute name="numberAlign" value="right" type="string"/>
+ <attribute name="minimum" type="number" value="1" />
+ <attribute name="maximum" type="number" value="100" />
+ <attribute name="step" value="1" type="number"/>
+ <attribute name="initialNumberInit" value="1" type="number"/>
+ <attribute name="initialNumber" value="3" type="number"/>
+
+ <attribute name="boxPosition" value="down" type="string"/>
+
+ <attribute name="labelid" value="429" type="number"/>
+
+ <event name="onplus" />
+ <event name="onminus" />
+
+ <handler name="oninit">
+ this.initialNumberInit=initialNumber;
+ </handler>
+
+ <method name="getValue">
+ return this.initialNumber;
+ </method>
+
+ <method name="setSliderValue" args="v">
+ this.initialNumber = v;
+ this.numericValue.setAttribute('tempValue',this.initialNumber);
+ this.numericValue.setAttribute('text',this.initialNumber);
+ if ($debug) Debug.write("setSliderValue ",v);
+ this.setEnabled(true);
+ </method>
+
+ <edittext name="numericValue" width="34" height="24" text="$once{
parent.initialNumber }" >
+ <attribute name="tempValue" value="$once{ parent.initialNumber }"
type="number" />
+ <handler name="onfocus">
+ this.tempValue = Number(this.getText());
+ </handler>
+ <handler name="onblur">
+ <![CDATA[
+ var t = parseInt(this.getText());
+ if (isNaN(t) || t > this.parent.maximum || t <
this.parent.minimum){
+ t = this.tempValue;
+ this.setAttribute('text',t);
+ lz.Focus.setFocus(this);
+ } else {
+ this.tempValue = t;
+ parent.setAttribute('initialNumber',t);
+ }
+ ]]>
+ </handler>
+ </edittext>
+
+
+ <button name="arrowView" x="36" width="24" y="1" height="23" >
+ <view name="arrow_down_slider" resource="arrow_down_slider_rsc"
+ x="4" y="3" />
+ <handler name="onclick">
+ if (this.parent.boxPosition=="up"){
+ var pick = new lz.changeWidthSliderWin(canvas,{
+
initialNumber:parent.numericValue.tempValue,
+
btnRef:this.parent,x:(parent.getAttributeRelative('x',canvas)),
+
maxvalue:parent.maximum,
+
y:(parent.getAttributeRelative('y',canvas)-140+parent.height)
+ });
+ } else {
+ var pick = new lz.changeWidthSliderWin(canvas,{
+
initialNumber:parent.numericValue.tempValue,
+
btnRef:this.parent,x:(parent.getAttributeRelative('x',canvas)),
+
maxvalue:parent.maximum,
+
y:(parent.getAttributeRelative('y',canvas))
+ });
+ }
+ lz.ModeManager.makeModal( pick );
+ </handler>
+ <labelTooltip labelid="$once{ parent.parent.labelid }" />
+ </button>
+
+</class>
+
+<class name="closableView" extends="view">
+ <method name="close">
+ lz.ModeManager.release(this);
+ this.destroy();
+ </method>
+</class>
+
+<class name="changeWidthSliderWin" extends="closableView" bgcolor="white"
+ clickable="true" width="58" height="140" >
+
+ <attribute name="btnRef" value="null" />
+ <attribute name="initialNumber" value="3" type="number"/>
+ <attribute name="maxvalue" value="100" type="number" />
+
+ <!--- @keywords private -->
+ <method name="passModeEvent" args="eventStr,view" >
+ <![CDATA[
+ if ( eventStr == "onmousedown" ){
+ if ( view != null ) {
+ if ( !view.childOf(this) ) {
+ this.close();
+ }
+ } else {
+ this.close();
+ }
+ }
+ if (view && view.childOf(this)) {
+ if (view[ eventStr ]) {
+ view[ eventStr ].sendEvent( view );
+ }
+ return false;
+ }
+ return true;
+ ]]>
+ </method>
+
+ <view bgcolor="$once{ canvas.baseMousecolorizer }" width="58" height="138"
x="1" y="1" />
+
+ <vslider name="_slider" height="120" y="10" x="10" minvalue="1"
maxvalue="$once{ parent.maxvalue }"
+ initvalue="$once{ parent.initialNumber }" showrange="false"
showvalue="true">
+ <handler name="onvalue" args="v">
+ //if ($debug) Debug.write("onvalue",v);
+ parent.btnRef.numericValue.tempValue = Number(v);
+ parent.btnRef.numericValue.setAttribute('text',v);
+ parent.btnRef.setAttribute('initialNumber',v);
+ </handler>
+ <handler name="onvalueChosenFinal">
+ parent.close();
+ </handler>
+ </vslider>
+
+ <view name="_close" x="$once{ parent.width-this.width-2 }" y="2"
+ resource="btn_presenter_close"
+ onmouseover="this.setAttribute('frame',2)"
+ onmouseout="this.setAttribute('frame',1)"
+ onmousedown="this.setAttribute('frame',3)"
+ onmouseup="this.setAttribute('frame',1)" >
+ <handler name="onclick">
+ this.setAttribute('frame',2);
+ this.parent.close();
+ </handler>
+ <labelTooltip labelid="430" />
+ </view>
+
+</class>
+
+</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/library.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+ <resource name="arrow_down_slider_rsc"
src="resources/arrow_down_slider.png" />
+
+ <include href="basePropertySelector.lzx" />
+ <include href="vslider.lzx" />
+ <include href="changeWidthSlider.lzx" />
+
+</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/resources/arrow_down_slider.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/resources/arrow_down_slider.png?rev=1292423&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/resources/arrow_down_slider.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/vslider.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/vslider.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/vslider.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/lps/vslider.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!-- X_LZ_COPYRIGHT_BEGIN ************************************************
+* Copyright 2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Use is subject to license terms. *
+* X_LZ_COPYRIGHT_END ************************************************** -->
+<!--
+ vertical slider contributed by Sebastian Wagner
+-->
+<library>
+
+ <class name="vsliderTrack" extends="view" bgcolor="0x000000">
+ <view width="${ parent.width-2}" height="${ parent.height-2 }"
+ x="1" y="1" bgcolor="0xFFFFFF"/>
+ <view width="${ parent.width-2}" bgcolor="0xCCCCCC"
+ x="1" y="${ (this.parent.parent.switchaxis) ?
+ parent.parent._sliderthumb.y : 1 }"
+ visible="${ parent.parent.showrange }"
+ height="${ (this.parent.parent.switchaxis) ?
+ (parent.parent._vslidertrack.height - parent.parent._sliderthumb.y-1)
:
+ parent.parent._sliderthumb.y }" />
+ </class>
+
+ <class name="vsliderThumb" extends="button" bgcolor="0x999999"
height="10" width="20"
+ onmousedown="dragger.apply()" onmouseup="dragger.remove()">
+
+ <attribute name="drag_min" value="0" type="number" />
+ <attribute name="showvalue" type="boolean" value="true" />
+ <attribute name="drag_max" value="0" type="number" />
+
+ <handler name="oninit">
+ //Setting the initVal
+ this.setY(getPosFromValue(this.parent.initvalue));
+ </handler>
+
+ <method name="getValueFromPos">
+ var delta1 = this.parent.maxvalue-this.parent.minvalue;
+ var perc = (this.parent.switchaxis) ? 1-(y /
(this.parent.height-this.height)) : (y / (this.parent.height-this.height));
+ //Debug.write(delta1,perc);
+ return (Math.round(perc*delta1))+this.parent.minvalue;
+ </method>
+
+ <method name="getPosFromValue" args="val">
+ var perc = (val-this.parent.minvalue) /
(this.parent.maxvalue-this.parent.minvalue);
+ //Debug.write(perc);
+ var valY = (this.parent.switchaxis) ? ( (1-perc) *
(this.parent.height-this.height)) : (perc * (this.parent.height-this.height));
+ //Debug.write("valY: ",Math.round(valY));
+ return Math.round(valY);
+ </method>
+
+ <handler name="ony" args="v">
+ //super.setY(v);
+ //if ($debug) Debug.write("setY: ",v);
+ var thumbVal = getValueFromPos();
+ if (thumbVal != parent.value) {
+ this.parent.setValue(thumbVal);
+ }
+ </handler>
+
+ <handler name="onclick">
+ parent.onvalueChosenFinal.sendEvent();
+ </handler>
+
+ <dragstate name="dragger" drag_axis="y"
+ drag_min_y="${ this.drag_min }"
+ drag_max_y="${ this.drag_max }">
+ <text name="t1" x="-26" text="${
this.parent.parent.value }" bgcolor="0xFFFFFF"
+ y="-4" resize="true" />
+ </dragstate>
+ </class>
+
+<class name="vslider" extends="view" >
+ <!--- Minimum Value -->
+ <attribute name="minvalue" type="number" value="0"/>
+
+ <!--- Maximum Value -->
+ <attribute name="maxvalue" type="number" value="100"/>
+
+ <!--- Showrange should the slidertrack be with color while 'sliding' -->
+ <attribute name="showrange" type="boolean" value="true"/>
+
+ <!--- showvalue should the slider show the numbers of min/max -->
+ <attribute name="showvalue" type="boolean" value="true"/>
+
+ <!--- switchaxis true means minimum-value is
+ t op maximum is bottom false turns around -->
+ <attribute name="switchaxis" type="boolean" value="false"/>
+
+ <!-- Initial Value -->
+ <attribute name="initvalue" value="0" type="number" />
+
+ <!--- @keywords private -->
+ <event name="onvalue"/>
+
+ <!--- @keywords private -->
+ <event name="onvalueChosenFinal"/>
+
+ <!--- @keywords private -->
+ <attribute name="value" value="0" setter="setValue(value)"/>
+ <method name="setValue" args="v">
+ if (!isinited) {
+ this.value = v;
+ return;
+ }
+ if (this.value == v) return;
+ this.value = v;
+ if (onvalue) onvalue.sendEvent(v);
+ </method>
+
+ <vsliderTrack name="_vslidertrack" x="5"
+ width="10" height="${ parent.height }" />
+
+ <vsliderThumb name="_sliderthumb"
+ drag_max="${ parent.height-this.height }"
+ showvalue="${ parent.showvalue }" />
+
+ <text text="${ ( (this.parent.switchaxis) ?
+ this.parent.maxvalue : this.parent.minvalue ) }"
+ visible="${ parent.showvalue }"
+ y="-8" x="${ this.parent._vslidertrack.width+10 }" />
+
+ <text text="${ ( (this.parent.switchaxis) ?
+ this.parent.minvalue : this.parent.maxvalue ) }"
+ visible="${ parent.showvalue }"
+ y="${ this.parent.height-10 }"
+ x="${ this.parent._vslidertrack.width+10 }" />
+
+</class>
+
+
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Wed Feb 22 17:56:01 2012
@@ -4,40 +4,51 @@
<library>
-<!---
- These colors are the main colors and style the hole application
- -->
-<attribute name="basebgcolorizer" value="0x3F5B9E" type="string" />
-<attribute name="baseMousecolorizer" value="0xC4D5E6" type="string" />
-<attribute name="baseMouseOvercolorizer" value="0xC4D5E6" type="string" />
-
-<!--- Audio-Video Quality Settings
- overwritten by values from the config.xml
- -->
-<attribute name="framesPerSecond" value="30" type="number" />
-<attribute name="bandwidthNeededNormal" value="16384" type="number" />
-<attribute name="bandwidthNeededBest" value="32768" type="number" />
-<attribute name="camQualityNormal" value="75" type="number" />
-<attribute name="camQualityBest" value="75" type="number" />
-<attribute name="microphoneRateNormal" value="22" type="number" />
-<attribute name="microphoneRateBest" value="44" type="number" />
+ <!---
+ These colors are the main colors and style the hole application
+ -->
+ <attribute name="basebgcolorizer" value="0x3F5B9E" type="string" />
+ <attribute name="baseMousecolorizer" value="0xC4D5E6" type="string" />
+ <attribute name="baseMouseOvercolorizer" value="0xC4D5E6" type="string"
/>
+
+ <!---
+ Audio-Video Quality Settings
+ overwritten by values from the config.xml
+ -->
+ <attribute name="framesPerSecond" value="30" type="number" />
+ <attribute name="bandwidthNeededNormal" value="16384" type="number" />
+ <attribute name="bandwidthNeededBest" value="32768" type="number" />
+ <attribute name="camQualityNormal" value="75" type="number" />
+ <attribute name="camQualityBest" value="75" type="number" />
+ <attribute name="microphoneRateNormal" value="22" type="number" />
+ <attribute name="microphoneRateBest" value="44" type="number" />
-<!---
-Holds a reference to the current VideoCOntainer Object
-containing the VideoViews
-and some more references to temp-objects
- -->
-<attribute name="_videocontainer" value="null" />
+ <!---
+ Holds a reference to the current VideoCOntainer Object
+ containing the VideoViews
+ and some more references to temp-objects
+ -->
+ <attribute name="_videocontainer" value="null" />
-<attribute name="currentNC" value="null" />
+ <attribute name="currentNC" value="null" />
-<attribute name="currentRoomObject" value="null"/>
+ <attribute name="currentRoomObject" value="null"/>
-<attribute name="userobject" value="null"/>
+ <attribute name="userobject" value="null"/>
-<attribute name="webAppRootKey" value="" type="string" />
+ <attribute name="webAppRootKey" value="" type="string" />
-<attribute name="httpRootKey" value="/" type="string" />
+ <attribute name="httpRootKey" value="/" type="string" />
+
+ <!---
+ A reference to the current screenSharingDialogContainer or
+ null if there is nothing to stream
+ -->
+ <attribute name="screenSharingDialogContainer" value="null" />
+
+ <attribute name="isAllowedToRemoteControl" value="true" type="boolean"
/>
+
+ <attribute name="ismoderator" value="true" type="boolean" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/hibAdapter.lzx
Wed Feb 22 17:56:01 2012
@@ -26,7 +26,8 @@
//Test application to record 5 seconds
client.doInitTestingApplication = this.doInitTestingApplication;
client.closeInitTestingApplication = this.closeInitTestingApplication;
- //Recording Player
+
+ //Recording Player Whiteboard
client.connectRecordingPlayer = this.connectRecordingPlayer;
client.playRecordingStream = this.playRecordingStream;
client.updateRecordingVideoPosition =
this.updateRecordingVideoPosition;
@@ -36,6 +37,13 @@
client.stopAndCloseRecordingConnection =
this.stopAndCloseRecordingConnection;
client.playbackWhiteboardVideo = this.playbackWhiteboardVideo;
client.stopWhiteboardVideo = this.stopWhiteboardVideo;
+
+ //Screen sharing player
+ client.newScreenSharing = this.newScreenSharing;
+ client.newScreenSharings = this.newScreenSharings;
+ client.closeScreenSharing = this.closeScreenSharing;
+ client.closeAllScreenSharings = this.closeAllScreenSharings;
+ client.updateCursorScreenSharing = this.updateCursorScreenSharing;
var rtmpLC:LocalConnection = new LocalConnection();
rtmpLC.connect(canvas.rtmp_lc_name);
@@ -226,6 +234,84 @@
}
]]>
</method>
+
+ <!---
+ #################################
+ Methods to handle screen sharing video playback and cursor
+ -->
+
+ <!---
+ Adds a new screen sharing playback video
+ -->
+ <method name="newScreenSharing" args="value">
+ <![CDATA[
+ if (value.streamPublishName != canvas.publicSID) {
+ if (canvas.screenSharingDialogContainer == null) {
+ canvas.screenSharingDialogContainer = new
lz.screenSharingDialogContainer(canvas);
+ }
+ new
lz.screenSharingDialog(canvas.screenSharingDialogContainer,{
+ initObject:value
+ });
+ } else {
+ if ($debug) Debug.warn("Self Screen Sharing");
+ }
+ ]]>
+ </method>
+
+ <!---
+ Add a list of screen sharing playback videos
+ (initially when entering the room invoked)
+ -->
+ <method name="newScreenSharings" args="value">
+ <![CDATA[
+ for (var eg in value) {
+ this.newScreenSharing(value[eg]);
+ }
+ ]]>
+ </method>
+
+ <!---
+ Close a single screen sharing playback video
+ -->
+ <method name="closeScreenSharing" args="value">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ var obj = canvas.screenSharingDialogContainer
+
.searchForSession(value.streamPublishName);
+ if (obj) {
+ obj.doClose();
+ }
+ }
+ ]]>
+ </method>
+
+ <!---
+ Closes all single screen sharing playback videos
+ -->
+ <method name="closeAllScreenSharings" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("closeAllScreenSharings ",value);
+ if (canvas.screenSharingDialogContainer != null) {
+ canvas.screenSharingDialogContainer.closeAll();
+ canvas.screenSharingDialogContainer.destroy();
+ canvas.screenSharingDialogContainer = null;
+ }
+ ]]>
+ </method>
+
+ <!---
+ Update the position of the cursor from the sharing screen
+ -->
+ <method name="updateCursorScreenSharing" args="value">
+ <![CDATA[
+ if (canvas.screenSharingDialogContainer != null) {
+ var obj = canvas.screenSharingDialogContainer
+
.searchForSession(value.streamPublishName);
+ obj.updateCursor(value.cursor_x,
value.cursor_y);
+ }
+ ]]>
+ </method>
+
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Wed
Feb 22 17:56:01 2012
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
-
+<canvas width="100%" height="100%" title="OpenMeetings">
+
<switch>
<when property="$as3">
<passthrough>
@@ -34,6 +34,8 @@
<include href="video/" />
+ <include href="screensharing/" />
+
<include href="audioVideoTest/" />
<include href="lzrecorder/" />
@@ -96,5 +98,5 @@
]]></handler>
<view name="inner"></view>
-
+
</canvas>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx?rev=1292423&r1=1292422&r2=1292423&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/maindebug.as3.lzx
Wed Feb 22 17:56:01 2012
@@ -36,6 +36,8 @@
<include href="video/" />
+ <include href="screensharing/" />
+
<include href="audioVideoTest/" />
<include href="lzrecorder/" />
@@ -98,5 +100,5 @@
]]></handler>
<view name="inner"></view>
-
+
</canvas>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx?rev=1292423&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/screensharing/library.lzx
Wed Feb 22 17:56:01 2012
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+
+ <include href="screenSharingDialog.lzx" />
+ <include href="videoObjectPlayScreenShare.lzx" />
+
+</library>
