Revision: 4670
Author: seba.wagner
Date: Sun Dec 4 03:48:45 2011
Log: Reduce logging of Red5
Fix resolution to be loaded from flash cookie if saved correctly
http://code.google.com/p/openmeetings/source/detail?r=4670
Modified:
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
/trunk/singlewebapp/red5-1.0.0-r4297/dist/conf/logback.xml
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Sat Dec 3 03:41:45 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Sun Dec 4 03:48:45 2011
@@ -48,9 +48,11 @@
} else {
//In case the user presses the Sync Button this box
should
//not close automatically and do the user-prefered values
- if(save && !this.isSyncUpdate) {
+ if(save && !this.isSyncUpdate &&
this.checkLocalDataComplete()) {
this.chosenCam = g["cam"];
this.chosenMic = g["mic"];
+ this.cam_default_width = g["width"];
+ this.cam_default_height = g["height"];
this.chosenSetting = g["avstored"];
this.remoteMessage = new Array();
this.remoteMessage[0] = 'avsettings';
@@ -62,11 +64,17 @@
}
}
}
-
-
-
]]>
</handler>
+
+ <method name="checkLocalDataComplete">
+ <![CDATA[
+ var g = canvas.getUserData();
+ if (g["width"] > 0 && g["height"] > 0) {
+ return true;
+ }
+ ]]>
+ </method>
<method name="storelocaldata">
<![CDATA[
@@ -76,6 +84,8 @@
g["mic"] = this.availibleMics.getValue();
g["avstored"] = this.availibleSettings.getValue();
g["savecamdata"] = this.holddatainSO.getValue();
+ g["width"] = this.cam_default_width;
+ g["height"] = this.cam_default_height;
canvas.setUserData(g);
]]>
</method>
@@ -353,18 +363,33 @@
<!--- @keywords private -->
<attribute name="cam_height" value="240" type="number" />
<handler name="ondata">
- // if ($debug) Debug.write("ondata ", this);
- var type = this.datapath.xpathQuery('@type');
- this.cam_width =
Number(this.datapath.xpathQuery('@width'));
- this.cam_height =
Number(this.datapath.xpathQuery('@height'));
-
this.setAttribute("text",""+this.cam_width+"x"+this.cam_height+"
["+type+"]");
- var isDefault = this.datapath.xpathQuery('@isDefault');
- if (isDefault == "true") {
- if ($debug) Debug.write("Found default one ",type);
- parent.selectItemAt(parent.counter);
- parent.onselect.sendEvent(this);
- }
- parent.counter+=1;
+ <![CDATA[
+ // if ($debug) Debug.write("ondata ", this);
+ var type = this.datapath.xpathQuery('@type');
+ this.cam_width =
Number(this.datapath.xpathQuery('@width'));
+ this.cam_height =
Number(this.datapath.xpathQuery('@height'));
+
this.setAttribute("text",""+this.cam_width+"x"+this.cam_height+"
["+type+"]");
+ var isDefault = this.datapath.xpathQuery('@isDefault');
+
+ var g = canvas.getUserData();
+ var width = g["width"];
+ var height = g["height"];
+ if (width!=null && width > 0 && height!=null &&
height>0) {
+
+ if (width == this.cam_width && height ==
this.cam_height) {
+ parent.selectItemAt(parent.counter);
+ parent.onselect.sendEvent(this);
+ }
+
+ } else {
+ if (isDefault == "true") {
+ if ($debug) Debug.write("Found default
one ",type);
+ parent.selectItemAt(parent.counter);
+ parent.onselect.sendEvent(this);
+ }
+ }
+ parent.counter+=1;
+ ]]>
</handler>
</textlistitem>
</resetCombobox>
=======================================
--- /trunk/singlewebapp/red5-1.0.0-r4297/dist/conf/logback.xml Fri Nov 18
11:42:48 2011
+++ /trunk/singlewebapp/red5-1.0.0-r4297/dist/conf/logback.xml Sun Dec 4
03:48:45 2011
@@ -57,10 +57,10 @@
<level value="WARN" />
</logger>
<logger name="org.red5.server.messaging.InMemoryPushPushPipe">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmpt.RTMPTServlet">
<level value="WARN" />
@@ -69,7 +69,7 @@
<level value="WARN" />
</logger>
<logger name="org.red5.server.net.proxy">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.remoting">
<level value="WARN" />
@@ -78,22 +78,22 @@
<level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmp.RTMPHandler">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmp.BaseRTMPHandler">
<level value="OFF" />
</logger>
<logger name="org.red5.server.net.rtmp.codec">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmp.RTMPMinaIoHandler">
<level value="OFF" />
</logger>
<logger name="org.red5.server.net.rtmp.RTMPMinaTransport">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmp.status">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.net.rtmpt">
<level value="WARN" />
@@ -105,7 +105,7 @@
<level value="WARN" />
</logger>
<logger name="org.red5.server.service">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.red5.server.so">
<level value="WARN" />
@@ -135,7 +135,7 @@
<level value="WARN" />
</logger>
<logger name="org.red5.server.adapter.MultiThreadedApplicationAdapter" >
- <level value="INFO"/>
+ <level value="WARN"/>
</logger>
<!-- Apache commons -->
<logger name="org.apache.commons">
@@ -146,13 +146,13 @@
</logger>
<!-- Apache catalina / tomcat -->
<logger name="org.red5.server.tomcat">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.apache.catalina">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.apache.catalina.loader">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.apache.catalina.realm">
<level value="WARN" />
@@ -161,20 +161,20 @@
<level value="WARN" />
</logger>
<logger name="org.apache.jasper">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.apache.tomcat">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.apache.tomcat.util.net">
<level value="WARN" />
</logger>
<logger name="org.apache.coyote.http11">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<!-- Spring -->
<logger name="org.springframework">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.springframework.beans.factory">
<level value="INFO" />
@@ -186,7 +186,7 @@
<level value="WARN" />
</logger>
<logger name="org.springframework.web.context">
- <level value="INFO" />
+ <level value="WARN" />
</logger>
<logger name="org.springframework.web.context.support">
<level value="WARN" />
@@ -203,12 +203,12 @@
</logger>
<!-- Jetty -->
<logger name="org.red5.server.jetty">
- <level value="DEBUG" />
+ <level value="WARN" />
</logger>
<logger name="org.mortbay">
- <level value="DEBUG" />
+ <level value="WARN" />
</logger>
<logger name="org.eclipse.jetty">
- <level value="DEBUG" />
+ <level value="WARN" />
</logger>
</configuration>
--
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.
