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:37:34 UTC
svn commit: r1220434 - in
/incubator/openmeetings/branches/video-components/WebContent/openmeetings:
./ base/ modules/conference/ modules/conference/interviewuserlist/
modules/conference/participents/ modules/conference/video/ swf10/
swf10/base/remote/...
Author: sebawagner
Date: Sun Dec 18 15:37:33 2011
New Revision: 1220434
URL: http://svn.apache.org/viewvc?rev=1220434&view=rev
Log:
Sync r4533 from video-components branch
Modified:
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.as3.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/interviewuserlist/interviewVideoBox.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/participents/participentList.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/editRecordStream.lzx
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=1220434&r1=1220433&r2=1220434&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:37:33 2011
@@ -15,11 +15,11 @@ these properties will be overwritten by
<attribute name="rtmp_lc"/>
-<attribute name="stream_lc_name" value="" type="String"/>
+<attribute name="videoComp_lc_name" value="" type="String"/>
-<attribute name="stream_lc_callback_name" value="" type="String"/>
+<attribute name="videoComp_lc_callback_name" value="" type="String"/>
-<attribute name="stream_lc"/>
+<attribute name="videoComp_lc"/>
<!--- URL/IP to use for the Server 192.168.178.28
inno02.fh-pforzheim.de macbook 192.168.2.103
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=1220434&r1=1220433&r2=1220434&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:37:33 2011
@@ -174,12 +174,12 @@
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");
+ this.setAttribute('videoComp_lc_name', this.lc_SID + "__streamLC");
+ this.setAttribute('videoComp_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);
+ var videoComp_lc = new LocalConnection();
+ videoComp_lc.connect(this.videoComp_lc_name);
+ this.setAttribute('videoComp_lc', videoComp_lc);
mainBaseText.setAttribute('text',canvas.currentappname);
Modified: 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=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/main.as3.lzx Sun Dec 18 15:37:33 2011
@@ -24,11 +24,11 @@
<attribute name="rtmp_lc"/>
- <attribute name="stream_lc_name" />
+ <attribute name="videoComp_lc_name" />
- <attribute name="stream_lc_callback_name" />
+ <attribute name="videoComp_lc_callback_name" />
- <attribute name="stream_lc" />
+ <attribute name="videoComp_lc" />
<include href="swf10/base/" />
@@ -56,12 +56,12 @@
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');
+ this.setAttribute('videoComp_lc_name', lc_SID + '__streamLC');
+ this.setAttribute('videoComp_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 videoComp_lc_cback:LocalConnection = new LocalConnection();
+ videoComp_lc_cback.connect(this.videoComp_lc_callback_name);
+ this.setAttribute('videoComp_lc',videoComp_lc_cback);
var request:URLRequest = new URLRequest("main.swf8.swf?lzproxied=solo&lcSID="+canvas.lc_SID);
var loader:Loader = new Loader();
Modified: 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=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/maindebug.as3.lzx Sun Dec 18 15:37:33 2011
@@ -24,11 +24,11 @@
<attribute name="rtmp_lc"/>
- <attribute name="stream_lc_name" />
+ <attribute name="videoComp_lc_name" />
- <attribute name="stream_lc_callback_name" />
+ <attribute name="videoComp_lc_callback_name" />
- <attribute name="stream_lc" />
+ <attribute name="videoComp_lc" />
<include href="swf10/base/" />
@@ -56,12 +56,12 @@
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');
+ this.setAttribute('videoComp_lc_name', lc_SID + '__streamLC');
+ this.setAttribute('videoComp_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 videoComp_lc_cback:LocalConnection = new LocalConnection();
+ videoComp_lc_cback.connect(this.videoComp_lc_callback_name);
+ this.setAttribute('videoComp_lc',videoComp_lc_cback);
var request:URLRequest = new URLRequest("maindebug.swf8.swf?lzproxied=solo&lcSID="+canvas.lc_SID);
var loader:Loader = new Loader();
Modified: 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=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/commonVideoComponentAdapter.lzx Sun Dec 18 15:37:33 2011
@@ -4,12 +4,16 @@
<class name="commonVideoComponentAdapter" extends="view">
<handler name="oninit">
- canvas.stream_lc.lc_switchMicMuted = function(publicSID, tMute) {
+ canvas.videoComp_lc.lc_switchMicMuted = function(publicSID, tMute) {
if ($debug) Debug.write("lc_switchMicMuted", publicSID, tMute);
canvas.thishib.switchMicMuted.setMute(publicSID, tMute);
};
</handler>
+ <handler name="onismoderator" reference="canvas" args="m">
+ canvas.lc.send(canvas.vid_lc_name, "ismoderatorChanged", m);
+ </handler>
+
<!--
set size of video objects
-->
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=1220434&r1=1220433&r2=1220434&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:37:33 2011
@@ -64,7 +64,7 @@
if ($debug) Debug.write("startInterView :: ");
//canvas._videocontainer._videoviewcontent.createVideoObject(canvas.publicSID, true, this.interviewPodId);
var t = this;
- canvas.stream_lc.onStartBroadcast = function(broadCastID, settings) {
+ canvas.videoComp_lc.onStartBroadcast = function(broadCastID, settings) {
//TODO: settings
if ($debug) Debug.write("onStartBroadcast :: ", broadCastID, settings);
t._videoPlay.setAttribute('chatpartnername',canvas.firstName+' '+canvas.lastName);
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=1220434&r1=1220433&r2=1220434&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:37:33 2011
@@ -45,7 +45,7 @@
<handler name="oninit">
<![CDATA[
var items = this._table.innerList.subnodes;
- canvas.stream_lc.lc_setSoundMuted = function(publicSID,isMuted) {
+ canvas.videoComp_lc.lc_setSoundMuted = function(publicSID,isMuted) {
if ($debug) Debug.write("lc_setSoundMuted: publicSID, isMuted",publicSID, isMuted);
for (var i=1; i<items.length; i++) {
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx?rev=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/modules/conference/video/editRecordStream.lzx Sun Dec 18 15:37:33 2011
@@ -32,13 +32,13 @@
//this.getBroadCastId.doCall();
var t = this;
canvas.lc.send(canvas.vid_lc_name, "createEditRecordStream", this.syncUpdate, this.isInterview);
- canvas.stream_lc.lc_getBroadCastId = function(chosenSetting,remoteMessage) {
+ canvas.videoComp_lc.lc_getBroadCastId = function(chosenSetting,remoteMessage) {
if ($debug) Debug.write("lc_getBroadCastId",chosenSetting,remoteMessage);
t.chosenSetting = chosenSetting;
t.remoteMessage = remoteMessage;
t.getBroadCastId.doCall();
};
- canvas.stream_lc.sendNotification = function(objMessage) {
+ canvas.videoComp_lc.sendNotification = function(objMessage) {
//if ($debug) Debug.write("Level sendNotification ",this.isgreater);
t.objMessage = objMessage;
t.sendMessage.doCall();
@@ -53,7 +53,7 @@
<![CDATA[
if ($debug) Debug.write("getBroadCastId",value,canvas.publicSID);
- canvas.stream_lc.send(canvas.stream_lc_callback_name, 'clb_getBroadCastId', value)
+ canvas.videoComp_lc.send(canvas.videoComp_lc_callback_name, 'clb_getBroadCastId', value)
canvas.setAttribute("currentMicName", Microphone.names[parent.chosenMic]);
canvas.setAttribute("currentCamName", Camera.names[parent.chosenCam]);
@@ -75,7 +75,7 @@
if ($debug) Debug.write("setUserAVSettings",value);
parent.currentClient = value;
//parent.doninitalize();
- canvas.stream_lc.send(canvas.stream_lc_callback_name, 'clb_setUserAVSettings', value);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_callback_name, 'clb_setUserAVSettings', value);
]]>
</handler>
</netRemoteCallHib>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx?rev=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/base/remote/baseVideoStreamDevice.lzx Sun Dec 18 15:37:33 2011
@@ -138,7 +138,7 @@
this.objMessage[0] = 'audioActivity';
this.objMessage[1] = this.isgreater;
this.objMessage[2] = parent.parent.publicSID;
- canvas.stream_lc.send(canvas.stream_lc_name, "sendNotification", this.objMessage);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, "sendNotification", this.objMessage);
</method>
</class>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx?rev=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/commonVideoViewContent.lzx Sun Dec 18 15:37:33 2011
@@ -40,7 +40,8 @@
client.removeVideoByUser = this.removeVideoByUser;
client.muteSound = this.muteSound;
client.videoOnMove = this.videoOnMove;
- client.updateMuteStatusVideoView = this.updateMuteStatusVideoView
+ client.updateMuteStatusVideoView = this.updateMuteStatusVideoView;
+ client.ismoderatorChanged = this.ismoderatorChanged;
var lc:LocalConnection = new LocalConnection();
lc.connect(canvas.vid_lc_name);
@@ -274,6 +275,10 @@
]]>
</method>
+ <method name="ismoderatorChanged" args="m">
+ canvas.setAttribute("ismoderator", m);
+ </method>
+
<method name="setSpeakingByPos" args="publicSID,bool">
<![CDATA[
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx?rev=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/baseVideoObject.lzx Sun Dec 18 15:37:33 2011
@@ -548,7 +548,7 @@
refObj:this,showCheckBox:false});
return;
} else {
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, false);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_switchMicMuted', this.publicSID, false);
}
} else {
//disable this action for now
@@ -575,7 +575,7 @@
refObj:this,showCheckBox:false});
return;
} else {
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, false);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_switchMicMuted', this.publicSID, false);
}
} else {
if (mute) {
@@ -596,7 +596,7 @@
<method name="confirmGloballyOff" args="bool,t" >
if ($debug) Debug.write("confirmGloballyOff :: ",bool);
if (bool) {
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_switchMicMuted', this.publicSID, true);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_switchMicMuted', this.publicSID, true);
}
</method>
Modified: incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/editRecordStream.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/editRecordStream.lzx?rev=1220434&r1=1220433&r2=1220434&view=diff
==============================================================================
--- incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/editRecordStream.lzx (original)
+++ incubator/openmeetings/branches/video-components/WebContent/openmeetings/swf10/video/editRecordStream.lzx Sun Dec 18 15:37:33 2011
@@ -46,7 +46,7 @@
if ($debug) Debug.write("this.myvideocontainer ",this.myvideocontainer);
if ($debug) Debug.write("editrecordstream ###################### ");
- canvas.stream_lc.client = {clb_getBroadCastId: this.clb_getBroadCastId, clb_setUserAVSettings: this.clb_setUserAVSettings};
+ canvas.videoComp_lc.client = {clb_getBroadCastId: this.clb_getBroadCastId, clb_setUserAVSettings: this.clb_setUserAVSettings};
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
@@ -68,7 +68,7 @@
this.remoteMessage[0] = 'avsettings';
this.remoteMessage[2] = this.chosenSetting;
//this.getBroadCastId.doCall();
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_getBroadCastId', this.chosenSetting, this.remoteMessage);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.chosenSetting, this.remoteMessage);
} else {
if (this.doDefaultAnimation) {
this._chooseDeviceAnimation.doStart();
@@ -170,7 +170,7 @@
case "vs":
videoview.broadcast(this.currentClient.broadCastID,_camera,null);
if(isInterview) {
- canvas.stream_lc.send(canvas.stream_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
} else {
this.myvideocontainer.setAttribute("visibility","visible");
}
@@ -178,7 +178,7 @@
case "av":
videoview.broadcast(this.currentClient.broadCastID,_camera,_micro);
if(isInterview) {
- canvas.stream_lc.send(canvas.stream_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
} else {
this.myvideocontainer.setAttribute("visibility","visible");
}
@@ -187,7 +187,7 @@
case "a":
videoview.broadcast(this.currentClient.broadCastID,null,_micro);
if(isInterview) {
- canvas.stream_lc.send(canvas.stream_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
} else {
if (this.myvideocontainer.hidebyAudioOnly) {
this.myvideocontainer.setAttribute("visibility","hidden");
@@ -202,7 +202,7 @@
case "v":
videoview.broadcast(this.currentClient.broadCastID,_camera,null);
if(isInterview) {
- canvas.stream_lc.send(canvas.stream_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, "onStartBroadcast", this.currentClient.broadCastID, settings);
} else {
this.myvideocontainer.setAttribute("visibility","visible");
}
@@ -411,7 +411,7 @@
this.parent.remoteMessage[1] = "0";
this.parent.remoteMessage[2] = this.parent.chosenSetting;
//this.parent.getBroadCastId.doCall();
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
</handler>
</simpleLabelButton>
@@ -434,8 +434,8 @@
this.parent.remoteMessage[1] = "0";
this.parent.remoteMessage[2] = this.parent.chosenSetting;
//this.parent.getBroadCastId.doCall();
- if ($debug) Debug.write(canvas.stream_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
- canvas.stream_lc.send(canvas.stream_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
+ if ($debug) Debug.write(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
+ canvas.videoComp_lc.send(canvas.videoComp_lc_name, 'lc_getBroadCastId', this.parent.chosenSetting, this.parent.remoteMessage);
</handler>
</simpleLabelButton>