You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/18 16:29:30 UTC
svn commit: r1220427 [1/2] - in
/incubator/openmeetings/branches/video-components: ./ WebContent/languages/
WebContent/openmeetings/ WebContent/openmeetings/base/
WebContent/openmeetings/base/hibernate/
WebContent/openmeetings/modules/conference/ WebCo...
Author: sebawagner
Date: Sun Dec 18 15:29:29 2011
New Revision: 1220427
URL: http://svn.apache.org/viewvc?rev=1220427&view=rev
Log:
Sync r4528 from video-components branch
Added:
incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx
Modified:
incubator/openmeetings/branches/video-components/WebContent/languages/english.xml
incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainAttributes.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainMethods.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewListInner.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewWhiteboard.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/library.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/_participents.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentListItem.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/restricted/restrictedUserList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoContainer.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/videoObjectPlayBroadcast.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/videoclassroom/videoContainerAudience.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/recording/video/videoContainerStream.lzx
incubator/openmeetings/branches/video-components/build.xml
incubator/openmeetings/branches/video-components/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/branches/video-components/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/branches/video-components/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Modified: incubator/openmeetings/branches/video-components/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/languages/english.xml?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/branches/video-components/WebContent/languages/english.xml Sun Dec 18 15:29:29 2011
@@ -5,7 +5,7 @@ This File is auto-generated by the Langu
to add new Languages or modify/customize it use the LanguageEditor
see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
###############################################-->
-<language>
+<language>
<string id="1" name="conference">
<value>Conference</value>
</string>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx Sun Dec 18 15:29:29 2011
@@ -113,7 +113,8 @@
//Load Session Data
this.getsessiondata.callRPC();
- }
+ }
+ canvas.lc.send(canvas.vid_lc_name, "reconnect", canvas.thishib.src);
</handler>
<method name="reconnectComplete">
@@ -432,6 +433,7 @@
} else {
canvas.setRoomValues(value.roomtype.roomtypes_id,value.rooms_id,value);
+ canvas.lc.send(canvas.rtmp_lc_name,"setRoomValues",value.roomtype.roomtypes_id,value.rooms_id,value);
}
} else {
new lz.labelerrorPopup(canvas,{errorlabelid:1286});
@@ -452,6 +454,7 @@
if($debug) Debug.write("hibRtmpConnection/userlang:[",parent.parent.userlang,"]");
//if($debug) Debug.write("hibRtmpConnection/getLanguageByIdAndMax:[",value,"]");
setLabelObjectByHundred(this.start,value);
+ canvas.lc.send(canvas.rtmp_lc_name, "hibAdapter_setLabelObjectByHundred", this.start, value);
//The onResult-Handler will be called be the rtmpconnection
if (this.start <= max){
this.start += this.step;
@@ -738,6 +741,7 @@
//The onResult-Handler will be called be the rtmpconnection
//Debug.write("getRoomTypes ",value);
canvas.roomTypesInitValues = value;
+ canvas.lc.send(canvas.rtmp_lc_name, "getRoomTypes", value);
canvas.thishib.loaderVar.setProgress();
parent.setUsernameAndSession.doCall();
</handler>
@@ -845,8 +849,8 @@
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("addNewUser: ",value);
- canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
- canvas.setAttribute('numberofpartners',canvas.getAttribute('numberofpartners')+1);
+ canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
+ canvas.setAttribute('numberofpartners',canvas.numberofpartners+1);
</handler>
</netRemoteCallHib>
@@ -976,7 +980,8 @@
if (value.isScreenClient) {
return;
}
- canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId);
+ //TODO: startStream called with invalid params. Move calling of video hib method's to swf10/.../hibRtmpConnection.lzx
+ //canvas._videocontainer.startStream(value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId);
</handler>
</netRemoteCallHib>
@@ -996,8 +1001,9 @@
} else {
//free the VideoContainer
- canvas._videocontainer.closeStreamClient(value.publicSID);
- canvas.setAttribute('numberofpartners',canvas.getAttribute('numberofpartners')-1);
+ //canvas._videocontainer.closeStreamClient(value.publicSID);
+ canvas.lc.send(canvas.vid_lc_name, "closeStreamClient", value.publicSID);
+ canvas.setAttribute('numberofpartners',canvas.numberofpartners-1);
}
//TODO:check first current tab
</handler>
@@ -1513,7 +1519,11 @@
if (value[0]=='audioActivity'){
//canvas.currentModApply
//Debug.write("audioActivity Client ",value[1],value[2]);
- canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
+ if (canvas._videocontainer.showsVideoInSeparateComponent) {
+ canvas.lc.send(canvas.vid_lc_name, "setSpeakingByPos", value[2],value[1]);
+ } else {
+ canvas._videocontainer.setSpeakingByPos(value[2],value[1]);
+ }
} else if (value[0]=='chat'){
// Not Used
//Debug.warn("Not Used");
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainAttributes.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainAttributes.lzx Sun Dec 18 15:29:29 2011
@@ -6,8 +6,22 @@
<!--
##########################################################
these properties will be overwritten by config.xml -->
-
-<!--- URL/IP to use for the Server 192.168.178.28
+
+<attribute name="vid_lc_name" value="" type="String"/>
+
+<attribute name="lc"/>
+
+<attribute name="rtmp_lc_name" value="" type="String"/>
+
+<attribute name="rtmp_lc"/>
+
+<attribute name="stream_lc_name" value="" type="String"/>
+
+<attribute name="stream_lc_callback_name" value="" type="String"/>
+
+<attribute name="stream_lc"/>
+
+<!--- URL/IP to use for the Server 192.168.178.28
inno02.fh-pforzheim.de macbook 192.168.2.103
192.168.2.102 bxlug.homelinux.org 213.219.160.72
if this value is empty it will try to connect to the
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainMethods.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainMethods.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/base/mainMethods.lzx Sun Dec 18 15:29:29 2011
@@ -157,7 +157,29 @@
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
- this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+ this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+
+ var pMap = {};
+ if($debug) Debug.write("Param query: ", _url.substr(_url.indexOf("?")+1));
+ var params:Array = _url.substr(_url.indexOf('?')+1).split('&');
+ for(var i:Number=0; i<params.length; i++ ) {
+ if($debug) Debug.write(params[i]);
+ var tokens:Array = params[i].split('=');
+ pMap[tokens[0]] = tokens[1];
+ if($debug) Debug.write("param: ", tokens[0], "=", tokens[1]);
+ }
+
+ if($debug) Debug.write("Params: ", pMap);
+
+ this.setAttribute('lc_SID', pMap['lcSID']);
+ this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
+ this.setAttribute('rtmp_lc_name', this.lc_SID + "__rtmpLC");
+ this.setAttribute('stream_lc_name', this.lc_SID + "__streamLC");
+ this.setAttribute('stream_lc_callback_name', this.lc_SID + "__streamLC_cback");
+
+ var stream_lc = new LocalConnection();
+ stream_lc.connect(this.stream_lc_name);
+ this.setAttribute('stream_lc', stream_lc);
mainBaseText.setAttribute('text',canvas.currentappname);
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx?rev=1220427&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx Sun Dec 18 15:29:29 2011
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
+
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.*;
+ import flash.display.*;
+ </passthrough>
+ </when>
+ </switch>
+
+ <include href="swf10/testVideoObject.lzx" />
+
+ <silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" />
+
+ <attribute name="lc_SID"/>
+
+ <attribute name="vid_lc_name" />
+
+ <attribute name="lc"/>
+
+ <attribute name="rtmp_lc_name" />
+
+ <attribute name="rtmp_lc"/>
+
+ <attribute name="stream_lc_name" />
+
+ <attribute name="stream_lc_callback_name" />
+
+ <attribute name="stream_lc" />
+
+ <include href="swf10/base/" />
+
+ <include href="swf10/video/" />
+
+ <include href="swf10/commonVideoViewContent.lzx" />
+
+ <include href="swf10/hibAdapter.lzx" />
+
+ <include href="swf10/miniIcons.lzx" />
+
+ <include href="swf10/dragHelper.lzx" />
+
+ <view name="mainComponent" width="${canvas.width}" height="${canvas.height}">
+ <text id="mainBaseText"> </text>
+ </view>
+ <!--<text name="text" y="20" width="100%" height="100%" multiline="true"></text>-->
+
+ <method name="getLCSID">
+ //TODO: fixme
+ return "" + Math.floor(999999*Math.random());
+ </method>
+
+ <handler name="oninit"><![CDATA[
+ this.setAttribute('lc_SID', this.getLCSID());
+ this.setAttribute('vid_lc_name', lc_SID + '__videoLC');
+ this.setAttribute('rtmp_lc_name', lc_SID + '__rtmpLC');
+ this.setAttribute('stream_lc_name', lc_SID + '__streamLC');
+ this.setAttribute('stream_lc_callback_name', lc_SID + '__streamLC_cback');
+
+ var stream_lc_cback:LocalConnection = new LocalConnection();
+ stream_lc_cback.connect(this.stream_lc_callback_name);
+ this.setAttribute('stream_lc',stream_lc_cback);
+
+ var request:URLRequest = new URLRequest("main.swf8.swf?lzproxied=solo&lcSID="+canvas.lc_SID);
+ var loader:Loader = new Loader();
+ loader.load(request);
+ this.mainComponent.sprite.addChild(loader);
+
+ new lz.commonVideoViewContent(this, {name:'_videoComponent'});
+ new lz.hibAdapter(this);
+
+ ]]></handler>
+
+ <view name="inner"></view>
+
+ <!--<commonVideoViewContent name="_videoComponent"/>-->
+ <!--<hibAdapter/>-->
+
+ <!--<view x="${canvas.width/2}" width="100" height="20" bgcolor="0xFF0000" opacity="0.5">-->
+ <!--<passthrough when="$as3">-->
+ <!--import flash.net.*;-->
+ <!--import flash.display.*;-->
+ <!--</passthrough>-->
+ <!--<text>Test SWF10</text>-->
+ <!--<handler name="onclick">-->
+ <!--var dragHelper = new lz.view(canvas, {name:'dragHelper',width:canvas.width,height:canvas.height,x:'0',y:'0',bgcolor:'0xAAAAFF', opacity:0.5});-->
+ <!--dragHelper.bringToFront();-->
+ <!--</handler>-->
+ <!--</view>-->
+
+
+
+ <!--<view name="debug" width="800" height="300" onmousedown="dragger.setAttribute('applied', true)" onmouseup="dragger.setAttribute('applied', false)" bgcolor="0x555555">-->
+ <!--<dragstate name="dragger"/>-->
+ <!--<text name="console" multiline="true" y="20" bgcolor="0xAAAAAA" width="100%"></text>-->
+ <!--<method name="write" args="text">-->
+ <!--this.console.setAttribute('text', this.console.getText() + '\n' + text);-->
+ <!--</method>-->
+ <!--</view>-->
+
+</canvas>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.lzx Sun Dec 18 15:29:29 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
-
+ <debug fontsize="11" oninit="Debug.showInternalProperties = true" />
<!--
If you use maindebug.lzx, main.lzx with debug=true is loaded.
h.kuze 2008.3.26
@@ -40,6 +40,7 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
+ canvas.lc = new LocalConnection();
</handler>
@@ -59,6 +60,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
+ canvas.lc.send(canvas.vid_lc_name, "clearAll");
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx?rev=1220427&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx Sun Dec 18 15:29:29 2011
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<canvas debug="true" width="100%" height="100%" title="OpenMeetings">
+
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.*;
+ import flash.display.*;
+ </passthrough>
+ </when>
+ </switch>
+
+ <include href="swf10/testVideoObject.lzx" />
+
+ <silverstyle name="componentStyle" basecolor="0xFFFFFF" textcolor="0x000000" />
+
+ <attribute name="lc_SID"/>
+
+ <attribute name="vid_lc_name" />
+
+ <attribute name="lc"/>
+
+ <attribute name="rtmp_lc_name" />
+
+ <attribute name="rtmp_lc"/>
+
+ <attribute name="stream_lc_name" />
+
+ <attribute name="stream_lc_callback_name" />
+
+ <attribute name="stream_lc" />
+
+ <include href="swf10/base/" />
+
+ <include href="swf10/video/" />
+
+ <include href="swf10/commonVideoViewContent.lzx" />
+
+ <include href="swf10/hibAdapter.lzx" />
+
+ <include href="swf10/miniIcons.lzx" />
+
+ <include href="swf10/dragHelper.lzx" />
+
+ <view name="mainComponent" width="${canvas.width}" height="${canvas.height}">
+ <text id="mainBaseText"> </text>
+ </view>
+ <!--<text name="text" y="20" width="100%" height="100%" multiline="true"></text>-->
+
+ <method name="getLCSID">
+ //TODO: fixme
+ return "" + Math.floor(999999*Math.random());
+ </method>
+
+ <handler name="oninit"><![CDATA[
+ this.setAttribute('lc_SID', this.getLCSID());
+ this.setAttribute('vid_lc_name', lc_SID + '__videoLC');
+ this.setAttribute('rtmp_lc_name', lc_SID + '__rtmpLC');
+ this.setAttribute('stream_lc_name', lc_SID + '__streamLC');
+ this.setAttribute('stream_lc_callback_name', lc_SID + '__streamLC_cback');
+
+ var stream_lc_cback:LocalConnection = new LocalConnection();
+ stream_lc_cback.connect(this.stream_lc_callback_name);
+ this.setAttribute('stream_lc',stream_lc_cback);
+
+ var request:URLRequest = new URLRequest("maindebug.swf8.swf?lzproxied=solo&lcSID="+canvas.lc_SID);
+ var loader:Loader = new Loader();
+ loader.load(request);
+ this.mainComponent.sprite.addChild(loader);
+
+ new lz.commonVideoViewContent(this, {name:'_videoComponent'});
+ new lz.hibAdapter(this);
+
+ ]]></handler>
+
+ <view name="inner"></view>
+
+ <!--<commonVideoViewContent name="_videoComponent"/>-->
+ <!--<hibAdapter/>-->
+
+ <!--<view x="${canvas.width/2}" width="100" height="20" bgcolor="0xFF0000" opacity="0.5">-->
+ <!--<passthrough when="$as3">-->
+ <!--import flash.net.*;-->
+ <!--import flash.display.*;-->
+ <!--</passthrough>-->
+ <!--<text>Test SWF10</text>-->
+ <!--<handler name="onclick">-->
+ <!--var dragHelper = new lz.view(canvas, {name:'dragHelper',width:canvas.width,height:canvas.height,x:'0',y:'0',bgcolor:'0xAAAAFF', opacity:0.5});-->
+ <!--dragHelper.bringToFront();-->
+ <!--</handler>-->
+ <!--</view>-->
+
+
+
+ <!--<view name="debug" width="800" height="300" onmousedown="dragger.setAttribute('applied', true)" onmouseup="dragger.setAttribute('applied', false)" bgcolor="0x555555">-->
+ <!--<dragstate name="dragger"/>-->
+ <!--<text name="console" multiline="true" y="20" bgcolor="0xAAAAAA" width="100%"></text>-->
+ <!--<method name="write" args="text">-->
+ <!--this.console.setAttribute('text', this.console.getText() + '\n' + text);-->
+ <!--</method>-->
+ <!--</view>-->
+
+</canvas>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.lzx Sun Dec 18 15:29:29 2011
@@ -41,6 +41,7 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
+ canvas.lc = new LocalConnection();
</handler>
@@ -60,6 +61,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
+ canvas.lc.send(canvas.vid_lc_name, "clearAll");
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
Added: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx?rev=1220427&view=auto
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx (added)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx Sun Dec 18 15:29:29 2011
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="commonVideoComponentAdapter" extends="view">
+
+ <!--
+ set size of video objects
+ -->
+ <method name="initVideoContainer" args="offsetLength,videoWidth,videoHeight">
+ canvas.lc.send(canvas.vid_lc_name, "initVideoContainer", canvas.publicSID,canvas.firstName,canvas.lastName,offsetLength,videoWidth,videoHeight);
+ </method>
+
+ <!--
+ Creates video object
+ -->
+ <method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId">
+ canvas.lc.send(canvas.vid_lc_name, "createVideo", publicSID, displayName, broadcastId, avsettings, interviewPodId);
+ </method>
+
+ <method name="createVideoObject" args="publicSID,isBroadcasting,interviewPodId">
+ canvas.lc.send(canvas.vid_lc_name, "createVideoObject", publicSID, isBroadcasting, interviewPodId);
+ </method>
+
+ <!--
+ invoked whenever a User starts to Stream Video in this Room,
+ interviewPodId has only a meaning in the Room Type Interview
+ -->
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ canvas.lc.send(canvas.vid_lc_name, "startStream", publicSID,broadcastId,firstname,lastname,interviewPodId);
+ </method>
+
+ <!---
+ invoked remotely by Red5-notification
+ shows a green light if somebody is speaking
+ @param string broadcastId broadcastId
+ @param boolean bool show light on/off
+ -->
+ <method name="setSpeakingByPos" args="publicSID,bool">
+ canvas.lc.send(canvas.vid_lc_name, "setSpeakingByPos", publicSID, bool);
+ </method>
+
+ <!---
+ stops the streaming but does not destroy the view
+ @param int broadcastId broadcastId
+ -->
+ <method name="closeStreamClient" args="publicSID">
+ canvas.lc.send(canvas.vid_lc_name, "closeStreamClient", publicSID);
+ </method>
+
+ <!---
+ stops the streaming but and destroys the view
+ @param int broadcastId broadcastId
+ -->
+ <method name="disconnectclient" args="publicSID">
+ canvas.lc.send(canvas.vid_lc_name, "disconnectclient", publicSID);
+ </method>
+
+ <method name="resetAllValues">
+ canvas.lc.send(canvas.vid_lc_name, "resetAllValues");
+ </method>
+
+ <!-- invoked if another client logs into the room
+ after choosing devices -->
+ <method name="setAVSettingsToClient" args="rcl">
+ canvas.lc.send(canvas.vid_lc_name, "setAVSettingsToClient", rcl);
+ </method>
+
+ <method name="createEditRecordStream" args="syncUpdate"><![CDATA[
+ //this.syncUpdate = syncUpdate;
+ //h.getBroadCastId.doCall();
+ canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", syncUpdate);
+ ]]></method>
+
+ <method name="removeVideoByUser" args="publicSID">
+ canvas.lc.send(canvas.vid_lc_name, "removeVideoByUser", publicSID);
+ </method>
+
+ <!--
+ Mutes/unmutes a sound of user's video
+ with the publicSID
+ -->
+ <method name="muteSound" args="publicSID">
+ canvas.lc.send(canvas.vid_lc_name, "muteSound", publicSID);
+ </method>
+
+</class>
+
+</library>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/eventuserlist/eventUserList.lzx Sun Dec 18 15:29:29 2011
@@ -19,6 +19,8 @@
<attribute name="colorArray" value="null" />
<attribute name="allowUserQuestions" value="true" type="boolean" />
+
+ <attribute name="showsVideoInSeparateComponent" value="true" type="boolean" />
<handler name="onallowUserQuestions" args="bool">
if (bool != null) {
@@ -51,6 +53,7 @@
//The user is already in the correct Scope
this.reconnectSuccess();
}
+ _videoviewcontent.initVideoContainer(40, 396, 360);
</handler>
<method name="reconnectSuccess">
@@ -157,65 +160,8 @@
<!-- invoked if another client logs into the room
after choosing devices -->
<method name="setAVSettingsToClient" args="rcl">
- if ($debug) Debug.write("setAVSettingsToClient ",rcl.publicSID,rcl);
- var obj = this.getVideoObjectByPublicSID(rcl.publicSID);
-
- if (obj == null) {
- obj = this.getNewVideoObjectByPos(rcl.publicSID);
- }
-
- if ($debug) Debug.write("setAVSettingsToClient: ",obj,rcl.avsettings);
- if (rcl.avsettings=="n"){
- obj.setAttribute("visibility","hidden");
- obj.setVideouserProfilePic(rcl);
- } else if (rcl.avsettings=="a"){
- obj.setVideouserProfilePic(rcl);
- if (!obj.minimized) {
- obj.minimize();
- }
- obj.setAttribute("visibility","visible");
- } else {
- obj.deleteVideoConfProfilePic();
- obj.setAttribute("visibility","visible");
- }
- obj.clientVars = rcl;
- obj.updateAVSettingsSymbol(rcl);
- </method>
-
-
- <!--- get a baseVideoObject by a Users publicSID
- @param string publicSID publicSID
- -->
- <method name="getVideoObjectByPublicSID" args="publicSID">
- <![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
-
- for (var i=0;i<videoContainer.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",videoContainer.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",videoContainer.subviews[i]);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",videoContainer.subviews[i].clientVars.streamid,videoContainer.subviews[i].clientVars.user_id);
- if (videoContainer.subviews[i].publicSID==publicSID){
- return videoContainer.subviews[i];
- }
- }
-
- if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
- return null;
-
- ]]>
- </method>
+ this._videoviewcontent.setAVSettingsToClient(rcl);
+ </method>
<method name="addItem" args="connectedSince,isMod,streamid,username,userroom,formatedDate,position,color,object">
<![CDATA[
@@ -230,29 +176,9 @@
//if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting);
if (object.isBroadcasting) {
-
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("object.avsettings: ",object.avsettings);
- if (object.avsettings=="n"){
- myvideocontainer.setVideouserProfilePic(object);
- //myvideocontainer.setAttribute("visibility","hidden");
- } else if (object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- if ($debug) Debug.warn("start play");
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","visible");
- } else {
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","visible");
- if ($debug) Debug.warn("start play");
- }
- myvideocontainer.updateAVSettingsSymbol(object);
- return myvideocontainer;
-
+ this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1);
} else {
- return null;
+ this._videoviewcontent.createVideoObject(object.publicSID, false, -1);
}
} else {
@@ -273,14 +199,7 @@
if (canvas.publicSID != object.publicSID){
if (object.isBroadcasting) {
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("addClientItem avsettings: ",object.avsettings);
- if (object.avsettings=="n" || object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- }
- myvideocontainer.updateAVSettingsSymbol(object);
+ this._videoviewcontent.createVideoObject(object.publicSID, false, -1);
}
}
@@ -295,22 +214,7 @@
interviewPodId has only a meaning in the Room Type Interview
-->
<method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
- <![CDATA[
- //if ($debug) Debug.write("startStream broadcastId: ",broadcastId);
- var obj = this.getVideoObjectByPublicSID(publicSID);
-
- if (obj == null) {
- obj = this.getNewVideoObjectByPos(publicSID);
- }
-
- //if ($debug) Debug.write("startStream obj: ",obj);
- if (obj != null ){
- obj._chatvideoinner._videostream.playStream(broadcastId,-1);
- obj.setAttribute('chatpartnername',firstname+' '+lastname);
- } else {
- if ($debug) Debug.warn("Could Not find the correct obj to startStream - This should not happen logically",publicSID);
- }
- ]]>
+ this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId);
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
@@ -322,79 +226,14 @@
]]>
</method>
- <!--
- This method returns an object of type videoObjectBroadcast
- you can only publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObject" args="publicSID">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- this.broadCastViewRef = obj;
- } else {
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 396, 360);
-
- this.broadCastViewRef = new lz.videoObjectBroadcast(videoContainer,{
- publicSID:publicSID,width:396,height:360,
- x:freePos[0],y:freePos[1]
- });
-
- this.broadCastViewRef._chatvideoinner.r.destroy();
- this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
- }
- return this.broadCastViewRef;
- ]]>
- </method>
-
<!---
- returns a new object of type videoObjectPlayBroadcast
- you can only play a stream not publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObjectByPos" args="publicSID">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- return obj;
- }
-
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 396, 360);
-
- return new lz.videoObjectPlayBroadcast(videoContainer,{
- publicSID:publicSID,width:396,height:360,
- x:freePos[0],y:freePos[1]
- });
- ]]>
- </method>
-
- <!---
- invoked remotely by Red5-notification
+ invoked remotely by Red5-notification
shows a green light if somebody is speaking
@param string broadcastId broadcastId
@param boolean bool show light on/off
-->
<method name="setSpeakingByPos" args="publicSID,bool">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (bool){
- obj._loudness.loudness.setAttribute('opacity',1);
- } else {
- obj._loudness.loudness.setAttribute('opacity',0.2);
- }
- ]]>
+ this._videoviewcontent.setSpeakingByPos(publicSID, bool);
</method>
<!---
@@ -402,20 +241,11 @@
@param int broadcastId broadcastId
-->
<method name="closeStreamClient" args="publicSID">
- <![CDATA[
- if ($debug) Debug.write("closeStreamclient: ",publicSID);
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if ($debug) Debug.write("closeStreamclient obj: ",obj);
- if (obj != null){
- obj.resetValues();
- }
- return obj;
- ]]>
+ this._videoviewcontent.closeStreamClient(publicSID);
</method>
<method name="removeVideoByUser" args="userObject">
- var obj = this.closeStreamClient(userObject.publicSID);
- obj.destroy();
+ this._videoviewcontent.removeVideoByUser(userObject.publicSID);
</method>
<!---
@@ -426,15 +256,10 @@
<![CDATA[
//if ($debug) Debug.write("disconnectclient: ",publicSID);
- var obj = this.getVideoObjectByPublicSID(publicSID);
+ this._videoviewcontent.disconnectclient(publicSID);
+
var objList = this._participents.getVideoObjectByPublicSID(publicSID);
-
- //if ($debug) Debug.write("disconnectclient obj: ",obj);
-
- if (obj != null){
- obj.resetValues();
- obj.destroy();
- }
+
if (objList != null){
objList.resetValues();
objList.destroy();
@@ -444,18 +269,12 @@
</method>
<method name="resetAllValues">
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
- for (var eg in videoContainer.subviews){
- videoContainer.subviews[eg].resetValues();
- }
+ this._videoviewcontent.resetAllValues();
</method>
<eventUserListInner name="_participents" listType="$once{ parent.listType }" />
-
- <commonVideoViewContent name="_videoviewcontent" />
+
+ <commonVideoComponentAdapter name="_videoviewcontent"/>
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Sun Dec 18 15:29:29 2011
@@ -52,6 +52,7 @@
if ($debug) Debug.write("roomobj: ",this.roomobj);
canvas.currentRoomObject = this.roomobj;
+ canvas.lc.send(canvas.rtmp_lc_name,"setRoomValues",this.roomobj.roomtype.roomtypes_id,this.roomobj.rooms_id,this.roomobj);
if (this.roomobj.isClosed) {
canvas.roomClosed();
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewListInner.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewListInner.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewListInner.lzx Sun Dec 18 15:29:29 2011
@@ -108,17 +108,9 @@
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
//if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
-
+
for (var i=0;i<this._table.innerList.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
+ //if ($debug) Debug.write("getVideoObjectByPublicSID : this._table.innerList.subviews[i]",this._table.innerList.subviews[i]);
if (this._table.innerList.subviews[i].refObj.publicSID==publicSID){
return this._table.innerList.subviews[i];
}
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewUserList.lzx Sun Dec 18 15:29:29 2011
@@ -10,6 +10,8 @@
<!--- colors for each user -->
<attribute name="colorArray" value="null" />
+
+ <attribute name="showsVideoInSeparateComponent" value="false" type="boolean" />
<handler name="oninit">
//set modus
@@ -34,6 +36,8 @@
//The user is already in the correct Scope
this.reconnectSuccess();
}
+
+ _videoviewcontent.initVideoContainer(40, 281, 281);
</handler>
<method name="reconnectSuccess">
@@ -157,9 +161,15 @@
} else if (rcl.avsettings=="a"){
obj.setVideouserProfilePic(rcl);
obj.setAttribute("visibility","visible");
+ if(rcl.publicSID != canvas.publicSID) {
+ this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
+ }
} else {
obj.deleteVideoConfProfilePic();
obj.setAttribute("visibility","visible");
+ if(rcl.publicSID != canvas.publicSID) {
+ this.startStream(rcl.publicSID, rcl.broadCastID, rcl.firstname, rcl.lastname, rcl.interviewPodId);
+ }
}
obj.clientVars = rcl;
obj.updateAVSettingsSymbol(rcl);
@@ -174,31 +184,16 @@
//if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
var videoContainer = canvas._drawarea._videoviewcontent;
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
-
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 VIEW: ",canvas.publicSID);
-
+
for (var i=0;i<videoContainer.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",videoContainer.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3: ",videoContainer.subviews[i]._videoPlay.publicSID);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4: ",videoContainer.subviews[i]._videoBroadCast.publicSID);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",videoContainer.subviews[i].clientVars.streamid,videoContainer.subviews[i].clientVars.user_id);
+ //if ($debug) Debug.write("getVideoObjectByPublicSID: videoContainer.subviews[i]._videoPlay",videoContainer.subviews[i]._videoPlay);
if (videoContainer.subviews[i]._videoPlay.publicSID == publicSID){
- videoContainer.subviews[i]._videoPlay.setAttribute("visibility","visible");
return videoContainer.subviews[i]._videoPlay;
}
- if (videoContainer.subviews[i]._videoBroadCast.publicSID == publicSID){
- videoContainer.subviews[i]._videoPlay.setAttribute("visibility","visible");
- return videoContainer.subviews[i]._videoPlay;
- }
}
-
+
if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
+
return null;
]]>
@@ -387,20 +382,13 @@
-->
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
+ if ($debug) Debug.write("setSpeakingByPos :: ",publicSID,bool,obj);
+
var obj = this.getVideoObjectByPublicSID(publicSID);
- //if ($debug) Debug.write("setSpeakingByPos :: ",publicSID,bool,obj);
if (bool){
- if (canvas.publicSID != publicSID) {
- obj._loudness.loudness.setAttribute('opacity',1);
- } else if (obj.parent._videoBroadCast.visibility == "visible") {
- obj.parent._videoBroadCast._loudness.loudness.setAttribute('opacity',1);
- }
+ obj._loudness.loudness.setAttribute('opacity',1);
} else {
- if (canvas.publicSID != publicSID) {
- obj._loudness.loudness.setAttribute('opacity',0.2);
- } else if (obj.parent._videoBroadCast.visibility == "visible") {
- obj.parent._videoBroadCast._loudness.loudness.setAttribute('opacity',0.2);
- }
+ obj._loudness.loudness.setAttribute('opacity',0.2);
}
]]>
</method>
@@ -440,7 +428,7 @@
//if ($debug) Debug.write("disconnectclient obj: ",obj);
if (obj != null){
- if ($debug) Debug.write("disconnectclient objList: ",objList);
+ if ($debug) Debug.write("disconnectclient obj: ",obj);
obj.resetValues();
//We will only hide this here cause we will need it again!
obj.setAttribute("visibility","hidden");
@@ -463,7 +451,7 @@
<interviewListInner name="_participents" />
- <commonVideoViewContent name="_videoviewcontent"/>
+ <commonVideoComponentAdapter name="_videoviewcontent"/>
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx Sun Dec 18 15:29:29 2011
@@ -54,14 +54,25 @@
<class name="interviewVideoBox" extends="view" width="322" height="281" bgcolor="0x000000">
<attribute name="interviewPodId" value="0" type="number" />
+
+ <!--<handler name="onx" args="x">-->
+ <!--if ($debug) Debug.write("# x", this.getAttributeRelative('x', canvas));-->
+ <!--canvas.lc.send(canvas.vid_lc_name, "videoOnMove", this.interviewPodId, this.getAttributeRelative('x', canvas), this.getAttributeRelative('y', canvas));-->
+ <!--</handler>-->
<method name="startInterView">
if ($debug) Debug.write("startInterView :: ");
- new lz.editRecordStream(this,{isInterview:true,
- myvideocontainer:this._videoBroadCast,
- doDefaultAnimation:false,
- align:'center',valign:'middle'
- });
+ //canvas._videocontainer._videoviewcontent.createVideoObject(canvas.publicSID, true, this.interviewPodId);
+ var t = this;
+ canvas.stream_lc.onStartBroadcast = function(broadCastID, settings) {
+ //TODO: settings
+ if ($debug) Debug.write("onStartBroadcast :: ", broadCastID, settings);
+ t._videoPlay.setAttribute('chatpartnername',canvas.firstName+' '+canvas.lastName);
+ t._videoPlay._chatvideoinner._videostream.playStream(broadCastID, -1);
+ t._videoPlay.setAttribute("visibility","visible");
+ t._videoPlay.setAttribute("publicSID", canvas.publicSID);
+ };
+ new lz.editRecordStream(this,{isInterview:true});
</method>
<method name="sendConfirmation" args="publicSID">
@@ -115,10 +126,6 @@
<videoObjectPlayBroadcast name="_videoPlay" isInterview="true" visibility="hidden"
width="$once{ parent.width }" height="$once{ parent.height }" />
-
-
- <videoObjectBroadcast name="_videoBroadCast" isInterview="true" visibility="hidden"
- width="$once{ parent.width }" height="$once{ parent.height }" />
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewWhiteboard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewWhiteboard.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewWhiteboard.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewWhiteboard.lzx Sun Dec 18 15:29:29 2011
@@ -41,6 +41,11 @@
<simplelayout axis="y" spacing="2" />
<commonVideoViewContent name="_videoviewcontent" align="center" >
+
+ <!--<handler name="onx" args="x">-->
+ <!--interviewVideoBox1.setAttribute('x',interviewVideoBox1.x);-->
+ <!--interviewVideoBox2.setAttribute('x',interviewVideoBox2.x);-->
+ <!--</handler>-->
<simplelayout axis="x" spacing="2" />
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/library.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/library.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/library.lzx Sun Dec 18 15:29:29 2011
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
<include href="commonVideoViewContent.lzx"/>
+ <include href="commonVideoComponentAdapter.lzx"/>
<include href="whiteboard/" />
<!-- <include href="remote/" />-->
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/_participents.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/_participents.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/_participents.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/_participents.lzx Sun Dec 18 15:29:29 2011
@@ -433,6 +433,8 @@
This is a variable to make it backwards compatible to the old room layout
-->
<attribute name="userNewVideoContainer" value="false" type="boolean"/>
+
+ <attribute name="showsVideoInSeparateComponent" value="true" type="boolean" />
<handler name="oninit">
//set modus
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx Sun Dec 18 15:29:29 2011
@@ -42,6 +42,30 @@
<view width="$once{ parent.width-2 }" height="${ parent.height-2 }"
x="1" y="1" bgcolor="white" />
+ <handler name="oninit">
+ <![CDATA[
+ var items = this._table.innerList.subnodes;
+ canvas.stream_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("participentList addItem: ",object,object.publicSID);
@@ -114,35 +138,21 @@
this._table.destroy();
new lz.participentsTable(this,{name:'_table'});
</method>
-
- <!--- get a Objects List Item
- @param string publicSID publicSID
- -->
- <method name="getVideoObjectByPublicSID" args="publicSID">
+
+ <method name="disconnectclient" args="publicSID">
<![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
-
for (var i=0;i<this._table.innerList.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
if (this._table.innerList.subviews[i].refObj.publicSID==publicSID){
- return this._table.innerList.subviews[i];
+ var item = this._table.innerList.subviews[i];
+ item.resetValues();
+ item.destroy();
+ break;
}
}
-
- return null;
-
]]>
</method>
- <participentsTable name="_table" y="20" />
+ <participentsTable name="_table" y="20" />
<view name="_miniIcons" x="132" y="0" height="18">
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentListItem.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentListItem.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentListItem.lzx Sun Dec 18 15:29:29 2011
@@ -354,6 +354,7 @@
} else {
new lz.labelerrorPopup(canvas,{errorlabelid:1409});
}
+ // TODO: canvas._videocontainer._videoviewcontent.muteSound(parent.parent.refObj.publicSID);
]]>
</handler>
<labelTooltip name="_text" text="" labelid="1407" />
@@ -533,9 +534,10 @@
<miniIcons name="_restartDevice" x="80" width="16" height="16" resource="resyncuser_rsc" showhandcursor="true">
<handler name="onclick">
- if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID);
- var myvideocontainer = canvas._videocontainer.getNewVideoObject(parent.parent.refObj.publicSID);
- myvideocontainer.resetValues();
+ //TODO: local connection call
+ if ($debug) Debug.write("parent.parent.refObj.publicSID: ",parent.parent.refObj.publicSID);
+ //var myvideocontainer = canvas._videocontainer.getNewVideoObject(parent.parent.refObj.publicSID);
+ //myvideocontainer.resetValues();
new lz.editRecordStream(canvas.main_content._content.inner,{isSyncUpdate:true});
</handler>
<labelTooltip labelid="610" />
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx?rev=1220427&r1=1220426&r2=1220427&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participents.lzx Sun Dec 18 15:29:29 2011
@@ -11,6 +11,8 @@
This is a variable to make it backwards compatible to the old room layout
-->
<attribute name="userNewVideoContainer" value="false" type="boolean"/>
+
+ <attribute name="showsVideoInSeparateComponent" value="true" type="boolean" />
<handler name="oninit">
//set modus
@@ -35,7 +37,10 @@
//The user is already in the correct Scope
this.reconnectSuccess();
}
+ _videoviewcontent.initVideoContainer(40, 132, 132);
</handler>
+
+ <commonVideoComponentAdapter name="_videoviewcontent"/>
<method name="reconnectSuccess">
if ($debug) Debug.write("User Reloged In");
@@ -71,7 +76,7 @@
if ($debug) Debug.write("canvas.becomemoderator: ",canvas.becomemoderator);
if ($debug) Debug.write("canvas.becomeSuperModerator: ",canvas.becomeSuperModerator);
- canvas.currentusercolor = parent._participents.getColorForUser();
+ canvas.currentusercolor = parent.getColorForUser();
var organisation_id = 1;
@@ -141,61 +146,9 @@
<!-- invoked if another client logs into the room
after choosing devices -->
<method name="setAVSettingsToClient" args="rcl">
- if ($debug) Debug.write("setAVSettingsToClient ",rcl.publicSID,rcl);
- var obj = this.getVideoObjectByPublicSID(rcl.publicSID);
- if ($debug) Debug.write("setAVSettingsToClient: ",obj,rcl.avsettings);
- if (obj == null) {
- if ($debug) Debug.warn("Could Not Find Instance setAVSettingsToClient ",rcl.publicSID);
- return;
- }
- if (rcl.avsettings=="n"){
- obj.setAttribute("visibility","hidden");
- obj.setVideouserProfilePic(rcl);
- } else if (rcl.avsettings=="a"){
- obj.setVideouserProfilePic(rcl);
- obj.setAttribute("visibility","hidden");
- } else {
- obj.deleteVideoConfProfilePic();
- obj.setAttribute("visibility","visible");
- }
- obj.clientVars = rcl;
- obj.updateAVSettingsSymbol(rcl);
+ this._videoviewcontent.setAVSettingsToClient(rcl);
</method>
-
- <!--- get a baseVideoObject by a Users publicSID
- @param string publicSID publicSID
- -->
- <method name="getVideoObjectByPublicSID" args="publicSID">
- <![CDATA[
- //if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID,parent.parent);
-
- //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
- // if ($debug) Debug.write("getVideoObjectByBroadCastId6 broadcastId: ",this._videoviewcontent.subviews[i].broadcastId);
- // if ($debug) Debug.write("getVideoObjectByBroadCastId7 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- //}
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- for (var i=0;i<videoContainer.subviews.length;i++){
- //if ($debug) Debug.write("getVideoObjectByBroadCastId2 broadcastId VIEW: ",this._videoviewcontent.subviews[i].broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId3 broadcastId SEARCH: ",broadcastId);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId4 obj: ",this._videoviewcontent.subviews[i]);
- //if ($debug) Debug.write("getVideoObjectByBroadCastId5 streamid,user_id: ",this._videoviewcontent.subviews[i].clientVars.streamid,this._videoviewcontent.subviews[i].clientVars.user_id);
- if (videoContainer.subviews[i].publicSID==publicSID){
- return videoContainer.subviews[i];
- }
- }
-
- if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
- return null;
-
- ]]>
- </method>
-
<method name="addItem" args="connectedSince,isMod,streamid,username,userroom,formatedDate,position,color,object">
<![CDATA[
if ($debug) Debug.write("initializeStreams addItem: ",connectedSince,object);
@@ -205,29 +158,12 @@
//if ($debug) Debug.write("???????? object.isBroadcasting :: ",object.isBroadcasting);
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("object.avsettings: ",object.avsettings);
- if (object.avsettings=="n"){
- myvideocontainer.setVideouserProfilePic(object);
- myvideocontainer.setAttribute("visibility","hidden");
- } else if (object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- if ($debug) Debug.warn("start play");
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","hidden");
- } else {
- myvideocontainer._chatvideoinner._videostream.playStream(object.broadCastID,-1);
- myvideocontainer.setAttribute("visibility","visible");
- if ($debug) Debug.warn("start play");
- }
- myvideocontainer.updateAVSettingsSymbol(object);
+ this._videoviewcontent.createVideo(object.publicSID, object.firstname+' '+object.lastname, object.broadCastID, object.avsettings, -1);
//do add others
this._participents.addItem(object);
- return myvideocontainer;
+ //return myvideocontainer;
} else {
//do add self too
@@ -237,44 +173,13 @@
]]>
</method>
-
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
- <![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
-
- if (canvas.publicSID != object.publicSID){
-
-
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("addClientItem avsettings: ",object.avsettings);
- if (object.avsettings=="n" || object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- }
- myvideocontainer.updateAVSettingsSymbol(object);
-
- }
- //Do Add it anyway
- this._participents.addItem(object);
- ]]>
+ <method name="setSpeakingByPos" args="publicSID,bool">
+ this._videoviewcontent.setSpeakingByPos(publicSID, bool);
</method>
-
- <!--
- invoked whenever a User starts to Stream Video in this Room,
- interviewPodId has only a meaning in the Room Type Interview
- -->
- <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
- <![CDATA[
- //if ($debug) Debug.write("startStream broadcastId: ",broadcastId);
- var obj = this.getVideoObjectByPublicSID(publicSID);
- //if ($debug) Debug.write("startStream obj: ",obj);
- if (obj != null ){
- obj._chatvideoinner._videostream.playStream(broadcastId,-1);
- obj.setAttribute('chatpartnername',firstname+' '+lastname);
- }
- ]]>
+
+ <method name="closeStreamClient" args="publicSID">
+ this._videoviewcontent.closeStreamClient(publicSID);
</method>
<method name="updateMuteStatusVideoView" args="roomClient">
@@ -286,139 +191,34 @@
]]>
</method>
- <!--
- This method returns an object of type videoObjectBroadcast
- you can only publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObject" args="publicSID">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- this.broadCastViewRef = obj;
- } else {
-
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- if ($debug) Debug.warn("videoContainer ",videoContainer);
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
-
- this.broadCastViewRef = new lz.videoObjectBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1],
- hidebyAudioOnly:true
- });
- canvas.currentusercolor = this.getColorForUser();
- this.broadCastViewRef._chatvideoinner.r.destroy();
- canvas.thishib.setAudienceModus.doCall();
- this.broadCastViewRef.setAttribute('chatpartnername',hib.userobject.firstname+' '+hib.userobject.lastname);
- }
- return this.broadCastViewRef;
- ]]>
+ <method name="disconnectclient" args="publicSID">
+ this._videoviewcontent.disconnectclient(publicSID);
+ this._participents.disconnectclient(publicSID);
</method>
-
- <!---
- returns a new object of type videoObjectPlayBroadcast
- you can only play a stream not publish you a/v with this object
- @param string broadcastId broadcastId
- -->
- <method name="getNewVideoObjectByPos" args="publicSID">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if (obj!=null){
- return obj;
- }
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
-
- //Get a Free VideoView Slot
- var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
-
- return new lz.videoObjectPlayBroadcast(videoContainer,{
- publicSID:publicSID,
- x:freePos[0],y:freePos[1]
- });
- ]]>
+
+ <method name="resetAllValues">
+ this._videoviewcontent.resetAllValues();
</method>
- <!---
- invoked remotely by Red5-notification
- shows a green light if somebody is speaking
- @param string broadcastId broadcastId
- @param boolean bool show light on/off
- -->
- <method name="setSpeakingByPos" args="publicSID,bool">
- <![CDATA[
- var obj = this.getVideoObjectByPublicSID(publicSID);
- var objList = this._participents.getVideoObjectByPublicSID(publicSID);
- if (bool){
- obj._loudness.loudness.setAttribute('opacity',1);
- objList._miniIcons._loudness.loudness.setAttribute('opacity',1);
- } else {
- obj._loudness.loudness.setAttribute('opacity',0.2);
- objList._miniIcons._loudness.loudness.setAttribute('opacity',0.2);
- }
- ]]>
- </method>
-
- <!---
- stops the streaming but does not destroy the view
- @param int broadcastId broadcastId
+ <!--
+ invoked whenever a User starts to Stream Video in this Room,
+ interviewPodId has only a meaning in the Room Type Interview
-->
- <method name="closeStreamClient" args="publicSID">
- <![CDATA[
- if ($debug) Debug.write("closeStreamclient: ",publicSID);
- var obj = this.getVideoObjectByPublicSID(publicSID);
- if ($debug) Debug.write("closeStreamclient obj: ",obj);
- if (obj != null){
- obj.resetValues();
- }
- ]]>
+ <method name="startStream" args="publicSID,broadcastId,firstname,lastname,interviewPodId">
+ this._videoviewcontent.startStream(publicSID,broadcastId,firstname,lastname,interviewPodId);
</method>
- <!---
- stops the streaming but and destroys the view
- @param int broadcastId broadcastId
- -->
- <method name="disconnectclient" args="publicSID">
+ <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
<![CDATA[
- if ($debug) Debug.write("disconnectclient: ",publicSID);
-
- var obj = this.getVideoObjectByPublicSID(publicSID);
- var objList = this._participents.getVideoObjectByPublicSID(publicSID);
-
- //if ($debug) Debug.write("disconnectclient obj: ",obj);
- if (obj == null) {
- if ($debug) Debug.warn("Could Not find CLient To disconnect",publicSID);
- }
-
- if (obj != null){
- obj.resetValues();
- obj.destroy();
- }
- if (objList != null){
- objList.resetValues();
- objList.destroy();
- }
- return null;
- ]]>
- </method>
-
- <method name="resetAllValues">
- var videoContainer = this._videoviewcontent;
- if (this.userNewVideoContainer) {
- videoContainer = parent.parent._videoviewcontent;
- }
- for (var eg in videoContainer.subviews){
- videoContainer.subviews[eg].resetValues();
+ if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
+
+ if (canvas.publicSID != object.publicSID){
+ this._videoviewcontent.createVideoObject(object.publicSID, false, -1);
}
+
+ //Do Add it anyway
+ this._participents.addItem(object);
+ ]]>
</method>
<moderationMiniIconsEventUserList name="_applyAndStatusIcons" showAvIcons="false" x="2" y="2" >
@@ -438,8 +238,6 @@
<participentList name="_participents" />
- <commonVideoViewContent name="_videoviewcontent" />
-
</class>
</library>
\ No newline at end of file