Author: seba.wagner
Date: Sat Sep 20 15:19:08 2008
New Revision: 1561
Modified:
trunk/openmeetings_lps411/base/hibernate/hibRtmpConnection.lzx
trunk/openmeetings_lps411/base/remote/rtmpConnection.lzx
trunk/openmeetings_lps411/maindebug.lzx.lzr=swf8.swf
trunk/openmeetings_lps411/modules/conference/conference/conferenceView.lzx
trunk/openmeetings_lps411/modules/conference/popups/changeDevice.lzx
trunk/openmeetings_lps411/modules/conference/video/editRecordStream.lzx
trunk/openmeetings_lps411/modules/conference/video/videoObjectBroadcast.lzx
trunk/openmeetings_lps411/modules/conference/video/videoObjectPlayBroadcast.lzx
Log:
Fixes rtmpConnection in LPS-4.1.1 to make basic functionality available
Modified: trunk/openmeetings_lps411/base/hibernate/hibRtmpConnection.lzx
==============================================================================
--- trunk/openmeetings_lps411/base/hibernate/hibRtmpConnection.lzx
(original)
+++ trunk/openmeetings_lps411/base/hibernate/hibRtmpConnection.lzx Sat Sep
20 15:19:08 2008
@@ -622,12 +622,13 @@
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendVarsToMessageWithClient"
funcname="sendVarsToMessageWithClient" remotecontext="$once{ canvas.thishib
}" >
+ <netRemoteCallHib name="sendVarsToMessageWithClient"
funcname="sendVarsToMessageWithClient"
+ remotecontext="$once{ canvas.thishib }" >
<netparam name="vars"><method name="getValue">return
parent.parent.applymessage;</method></netparam>
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
-
//Debug.write("sendVarsToMessageWithClient :
",value,value.message,value.message[0],value.client);
+ if ($debug)
Debug.write("sendVarsToMessageWithClient :
",value,value.message,value.message[0],value.client);
if (value.message[0]=='applyforMod'){
//canvas.currentModApply
if (canvas.streamid!=value.client.streamid) new
lz.responseForModeration(canvas.main_content._content.inner,{userobject:value.client,clientId:value.client.streamid});
Modified: trunk/openmeetings_lps411/base/remote/rtmpConnection.lzx
==============================================================================
--- trunk/openmeetings_lps411/base/remote/rtmpConnection.lzx (original)
+++ trunk/openmeetings_lps411/base/remote/rtmpConnection.lzx Sat Sep 20
15:19:08 2008
@@ -86,9 +86,9 @@
for (var i=0;i<this.subnodes.length;i++){
//If it is of Type netRemoteCallHib then register
it to the
NetConnection
if (this.subnodes[i] instanceof
lz.netRemoteCallHib){
- var t = this;
+ var t = hib;
this._nc[this.subnodes[i].funcname] = function(
args ){
- return
t.remoteCallMethod(arguments.callee,args);
+ return
hib.remoteCallMethod(arguments.callee,args);
}
}
}
@@ -102,7 +102,7 @@
-->
<method name="remoteCallMethod" args="callee,args">
<![CDATA[
- for (eg in this._nc){
+ for (var eg in this._nc){
if (this._nc[eg]==callee){
if (this.debug) {
//_root.Debug.write.write("DEBUG invoked a
function remotely: ",eg,args);
Modified: trunk/openmeetings_lps411/maindebug.lzx.lzr=swf8.swf
==============================================================================
Binary files. No diff available.
Modified:
trunk/openmeetings_lps411/modules/conference/conference/conferenceView.lzx
==============================================================================
---
trunk/openmeetings_lps411/modules/conference/conference/conferenceView.lzx
(original)
+++
trunk/openmeetings_lps411/modules/conference/conference/conferenceView.lzx
Sat Sep 20 15:19:08 2008
@@ -137,12 +137,14 @@
if ($debug) Debug.write("isloadedImage: ",val);
</handler>
</newWhiteBoard>
+ <!--
<view name="currentmainobjectisMod" visible="${ !canvas.ismoderator }"
x="0" y="22" height="$once{ parent.height-22 }" width="$once{
parent.width }" >
<handler name="onclick">
new lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(97)});
</handler>
</view>
+ -->
</class>
<class name="modPanel" extends="guiPresenter" x="2" y="284"
Modified:
trunk/openmeetings_lps411/modules/conference/popups/changeDevice.lzx
==============================================================================
--- trunk/openmeetings_lps411/modules/conference/popups/changeDevice.lzx
(original)
+++ trunk/openmeetings_lps411/modules/conference/popups/changeDevice.lzx
Sat Sep 20 15:19:08 2008
@@ -64,7 +64,7 @@
</handler>
</combobox>
- <labelText labelid="53" fontsize="12" x="10" y="80" />
+ <labelText text="LABEL53" labelid="53" fontsize="12" x="10" y="80" />
<combobox fontsize="12" id="availibleMics3" x="10" y="100"
width="280" editable="false">
<handler name="oninit">
Modified:
trunk/openmeetings_lps411/modules/conference/video/editRecordStream.lzx
==============================================================================
--- trunk/openmeetings_lps411/modules/conference/video/editRecordStream.lzx
(original)
+++ trunk/openmeetings_lps411/modules/conference/video/editRecordStream.lzx
Sat Sep 20 15:19:08 2008
@@ -199,6 +199,7 @@
break;
}
this.parent.availibleCamsLabel.setAttribute("visibility",camVisible);
+ this.parent.availibleCamsLabel.bringToFront();
this.parent.availibleCams.setAttribute("visibility",camVisible);
this.parent.availibleMicsLabel.setAttribute("visibility",micVisible);
this.parent.availibleMics.setAttribute("visibility",micVisible);
@@ -208,6 +209,11 @@
</combobox>
<labelText name="availibleCamsLabel" labelid="52" fontsize="12" x="10"
y="80" />
+ <labelText name="availibleCamsLabel_2" labelid="52" fontsize="12"
x="10" y="80" >
+ <handler name="oninit">
+ if ($debug) Debug.write("Bayovarisch Narrisch",this);
+ </handler>
+ </labelText>
<combobox fontsize="12" name="availibleCams" x="10" y="100"
width="280" editable="false">
<handler name="oninit">
@@ -234,7 +240,7 @@
</handler>
</combobox>
- <labelText name="availibleMicsLabel" labelid="53" fontsize="12" x="10"
y="120" />
+
<combobox fontsize="12" name="availibleMics" x="10" y="140"
width="280" editable="false">
<handler name="oninit">
@@ -263,6 +269,8 @@
<labelText name="infoTextNoAV" labelid="452" multiline="true"
width="280"
fontsize="12" x="10" y="80" visibility="hidden" />
+
+ <labelText name="availibleMicsLabel" labelid="53" fontsize="12" x="10"
y="120" />
<!-- Remember Me -->
<checkbox name="holddatainSO" text="Do not ask again" x="10" y="210">
Modified:
trunk/openmeetings_lps411/modules/conference/video/videoObjectBroadcast.lzx
==============================================================================
---
trunk/openmeetings_lps411/modules/conference/video/videoObjectBroadcast.lzx
(original)
+++
trunk/openmeetings_lps411/modules/conference/video/videoObjectBroadcast.lzx
Sat Sep 20 15:19:08 2008
@@ -37,20 +37,22 @@
<view name="_chatvideoinner" x="1" y="20" height="${parent.height-20}"
width="${parent.width-2}">
<view name="r" resource="chatbgitem" x="1" y="2"
stretches="both"
- width="${parent.width}" height="${parent.height}" />
+ width="$once{parent.width}"
height="$once{parent.height}" />
<handler name="oninit">
this.r.setResourceNumber(5);
</handler>
<baseVideoStreamDevice name="_videostream" mode="broadcast"
- width="${parent.width}"
height="${parent.height}" bgcolor="black" >
+ width="$once{parent.width}"
height="$once{parent.height}"
bgcolor="black" >
<handler name="oninit">
- var f = function () {
- this.applySizeToVid();
- }
- var prop1 = [this, "width"];
- this.applyConstraint("width", f, prop1);
+ //disabled cause it does not work in LPS-4.1.1
+ // swagner 20.09.2008
+ //var f = function () {
+ // this.applySizeToVid();
+ //}
+ //var prop1 = [this, "width"];
+ //this.applyConstraint("width", f, prop1);
</handler>
</baseVideoStreamDevice>
Modified:
trunk/openmeetings_lps411/modules/conference/video/videoObjectPlayBroadcast.lzx
==============================================================================
---
trunk/openmeetings_lps411/modules/conference/video/videoObjectPlayBroadcast.lzx
(original)
+++
trunk/openmeetings_lps411/modules/conference/video/videoObjectPlayBroadcast.lzx
Sat Sep 20 15:19:08 2008
@@ -19,29 +19,31 @@
this._loudness.bringToFront();
this.showuser.bringToFront();
- this.setAttribute("ratioW",this.width / myconferenceView.initW);;
- this.setAttribute("ratioH",this.height / myconferenceView.initH);
+ //disabled cause it does not work in LPS-4.1.1
+ // swagner 20.09.2008
+ //this.setAttribute("ratioW",this.width / myconferenceView.initW);;
+ //this.setAttribute("ratioH",this.height / myconferenceView.initH);
- this.setAttribute("width",myconferenceView.width * this.ratioW);
- this.setAttribute("height",myconferenceView.height * this.ratioH);
+ //this.setAttribute("width",myconferenceView.width * this.ratioW);
+ //this.setAttribute("height",myconferenceView.height * this.ratioH);
- var f = function () {
- this.setAttribute("width",myconferenceView.width * this.ratioW);
- this.setAttribute("height",myconferenceView.height *
this.ratioH);
- }
- var prop = [this.parent, "width"];
- this.applyConstraint("width", f, prop);
+ //var f = function () {
+ // this.setAttribute("width",myconferenceView.width *
this.ratioW);
+ // this.setAttribute("height",myconferenceView.height *
this.ratioH);
+ //}
+ //var prop = [this.parent, "width"];
+ //this.applyConstraint("width", f, prop);
]]>
</handler>
<view name="_chatvideoinner" x="1" y="20" width="${parent.width-2}"
height="${parent.height-20}" >
<view name="r" resource="chatbgitem" x="1" y="2"
- stretches="both" width="${parent.width}"
height="${parent.height}"
/>
+ stretches="both" width="$once{parent.width}"
height="$once{parent.height}" />
<handler name="oninit">
this.r.setResourceNumber(5);
</handler>
<baseVideoStream name="_videostream"
- width="${parent.width}"
height="${parent.height}" bgcolor="black" >
+ width="$once{parent.width}"
height="$once{parent.height}"
bgcolor="black" >
<handler name="oninit">
var f = function () {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---