Revision: 4663
Author: seba.wagner
Date: Fri Dec 2 05:22:39 2011
Log: Update issue 970
New settings to change the resolution in the audio/video settings.
Something to remind the user settings is tbd still
http://code.google.com/p/openmeetings/source/detail?r=4663
Added:
/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/messagebox_warning.png
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/schema/GenerateConfigXsd.java
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/dutch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/config.xml
/trunk/singlewebapp/WebContent/src/base/remote/baseVideoView.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
=======================================
--- /dev/null
+++ /trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd Fri
Dec 2 05:22:39 2011
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
+ <xs:element name="config">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="rtmphostlocal"/>
+ <xs:element ref="rtmpport"/>
+ <xs:element ref="rtmpTunnelport"/>
+ <xs:element ref="rtmpsslport"/>
+ <xs:element ref="useSSL"/>
+ <xs:element ref="red5httpport"/>
+ <xs:element ref="protocol"/>
+ <xs:element ref="proxyType"/>
+ <xs:element ref="basebgcolorizer"/>
+ <xs:element ref="baseMousecolorizer"/>
+ <xs:element ref="baseMouseOvercolorizer"/>
+ <xs:element ref="currentappname"/>
+ <xs:element ref="currentappnameurl"/>
+ <xs:element ref="currentappnamebugurl"/>
+ <xs:element ref="loudnessAcitviation"/>
+ <xs:element ref="webAppRootKey"/>
+ <xs:element ref="httpRootKey"/>
+ <xs:element ref="showWindowEffect"/>
+ <xs:element ref="showRecording"/>
+ <xs:element ref="firstdayinweek"/>
+ <xs:element ref="framesPerSecond"/>
+ <xs:element ref="bandwidthNeededNormal"/>
+ <xs:element ref="bandwidthNeededBest"/>
+ <xs:element ref="camQualityNormal"/>
+ <xs:element ref="camQualityBest"/>
+ <xs:element ref="microphoneRateNormal"/>
+ <xs:element ref="microphoneRateBest"/>
+ <xs:element ref="defaultWhiteboardWidth"/>
+ <xs:element ref="defaultWhiteboardHeight"/>
+ <xs:element ref="availableCameraResolutions"/>
+ <xs:element ref="adminModuleUser"/>
+ <xs:element ref="adminModuleRoom"/>
+ <xs:element ref="adminModuleOrg"/>
+ <xs:element ref="adminModuleLanguages"/>
+ <xs:element ref="adminModuleConnections"/>
+ <xs:element ref="adminModuleConfiguration"/>
+ <xs:element ref="adminModuleBackup"/>
+ <xs:element ref="adminModuleLDAP"/>
+ <xs:element ref="moderatorModuleUser"/>
+ <xs:element ref="moderatorModuleRoom"/>
+ <xs:element ref="dashboardModuleStartScreen"/>
+ <xs:element ref="dashboardModuleCalendar"/>
+ <xs:element ref="conferenceModuleRoomList"/>
+ <xs:element ref="conferenceRoomModule"/>
+ <xs:element ref="eventModuleRoomList"/>
+ <xs:element ref="eventRoomModule"/>
+ <xs:element ref="restrictedRoomModule"/>
+ <xs:element ref="interviewRoomModule"/>
+ <xs:element ref="recordModule"/>
+ <xs:element ref="userSettingsModule"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="rtmphostlocal">
+ <xs:complexType/>
+ </xs:element>
+ <xs:element name="rtmpport" type="xs:integer"/>
+ <xs:element name="rtmpTunnelport" type="xs:integer"/>
+ <xs:element name="rtmpsslport" type="xs:integer"/>
+ <xs:element name="useSSL" type="xs:NCName"/>
+ <xs:element name="red5httpport" type="xs:integer"/>
+ <xs:element name="protocol" type="xs:NCName"/>
+ <xs:element name="proxyType" type="xs:NCName"/>
+ <xs:element name="basebgcolorizer" type="xs:NMTOKEN"/>
+ <xs:element name="baseMousecolorizer" type="xs:NMTOKEN"/>
+ <xs:element name="baseMouseOvercolorizer" type="xs:NMTOKEN"/>
+ <xs:element name="currentappname" type="xs:NCName"/>
+ <xs:element name="currentappnameurl" type="xs:anyURI"/>
+ <xs:element name="currentappnamebugurl" type="xs:anyURI"/>
+ <xs:element name="loudnessAcitviation" type="xs:integer"/>
+ <xs:element name="webAppRootKey" type="xs:NCName"/>
+ <xs:element name="httpRootKey" type="xs:string"/>
+ <xs:element name="showWindowEffect" type="xs:NCName"/>
+ <xs:element name="showRecording" type="xs:NCName"/>
+ <xs:element name="firstdayinweek" type="xs:integer"/>
+ <xs:element name="framesPerSecond" type="xs:integer"/>
+ <xs:element name="bandwidthNeededNormal" type="xs:integer"/>
+ <xs:element name="bandwidthNeededBest" type="xs:integer"/>
+ <xs:element name="camQualityNormal" type="xs:integer"/>
+ <xs:element name="camQualityBest" type="xs:integer"/>
+ <xs:element name="microphoneRateNormal" type="xs:integer"/>
+ <xs:element name="microphoneRateBest" type="xs:integer"/>
+ <xs:element name="defaultWhiteboardWidth" type="xs:integer"/>
+ <xs:element name="defaultWhiteboardHeight" type="xs:integer"/>
+ <xs:element name="availableCameraResolutions">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="resolution"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resolution">
+ <xs:complexType>
+ <xs:attribute name="height" use="required" type="xs:integer"/>
+ <xs:attribute name="isDefault" use="required" type="xs:boolean"/>
+ <xs:attribute name="type" use="required"/>
+ <xs:attribute name="width" use="required" type="xs:integer"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="adminModuleUser" type="xs:NCName"/>
+ <xs:element name="adminModuleRoom" type="xs:NCName"/>
+ <xs:element name="adminModuleOrg" type="xs:NCName"/>
+ <xs:element name="adminModuleLanguages" type="xs:NCName"/>
+ <xs:element name="adminModuleConnections" type="xs:NCName"/>
+ <xs:element name="adminModuleConfiguration" type="xs:NCName"/>
+ <xs:element name="adminModuleBackup" type="xs:NCName"/>
+ <xs:element name="adminModuleLDAP" type="xs:NCName"/>
+ <xs:element name="moderatorModuleUser" type="xs:NCName"/>
+ <xs:element name="moderatorModuleRoom" type="xs:NCName"/>
+ <xs:element name="dashboardModuleStartScreen" type="xs:NCName"/>
+ <xs:element name="dashboardModuleCalendar" type="xs:NCName"/>
+ <xs:element name="conferenceModuleRoomList" type="xs:NCName"/>
+ <xs:element name="conferenceRoomModule" type="xs:NCName"/>
+ <xs:element name="eventModuleRoomList" type="xs:NCName"/>
+ <xs:element name="eventRoomModule" type="xs:NCName"/>
+ <xs:element name="restrictedRoomModule" type="xs:NCName"/>
+ <xs:element name="interviewRoomModule" type="xs:NCName"/>
+ <xs:element name="recordModule" type="xs:NCName"/>
+ <xs:element name="userSettingsModule" type="xs:NCName"/>
+</xs:schema>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/resources/messagebox_warning.png
Fri Dec 2 05:22:39 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/singlewebapp/src/dtdgenerator/org/openlaszlo/schema/GenerateConfigXsd.java
Fri Dec 2 05:22:39 2011
@@ -0,0 +1,28 @@
+package org.openlaszlo.schema;
+
+import java.io.File;
+
+import com.thaiopensource.relaxng.translate.Driver;
+
+public class GenerateConfigXsd {
+
+ public static void main(String... args) {
+ new GenerateConfigXsd();
+ }
+
+ public GenerateConfigXsd() {
+ try {
+
+ String[] args = {
+
"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"config.xml",
+
"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"openmeetings-config.xsd"
+ };
+
+ Driver.main(args);
+
+ } catch (Exception err) {
+ err.printStackTrace();
+ }
+ }
+
+}
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Fri Dec 2 05:22:39
2011
@@ -4291,4 +4291,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Dec 2
05:22:39 2011
@@ -4289,4 +4289,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Fri
Dec 2 03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Fri
Dec 2 05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri
Dec 2 03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri
Dec 2 05:22:39 2011
@@ -4296,4 +4296,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Fri Dec 2 05:22:39
2011
@@ -4289,4 +4289,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Dec
2 03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Dec
2 05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Kamera-Auflösung</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Die Kamera-Auslösung hat einen direkten Einfluss auf die
verbrauchte Upload-Bandbreite!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/dutch.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/dutch.xml Fri Dec 2 05:22:39
2011
@@ -4286,4 +4286,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Fri Dec 2
05:22:39 2011
@@ -4289,4 +4289,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Fri Dec 2 05:22:39
2011
@@ -4363,4 +4363,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Dec
2 03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Dec
2 05:22:39 2011
@@ -4296,4 +4296,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Fri Dec 2
05:22:39 2011
@@ -4298,4 +4298,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Fri Dec 2 03:12:38
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Fri Dec 2 05:22:39
2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Fri Dec 2
05:22:39 2011
@@ -4289,4 +4289,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Dec 2
03:12:38 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Dec 2
05:22:39 2011
@@ -4290,4 +4290,10 @@
<string id="1428" name="excl_audio status icons">
<value>Give a permission for exclusive audio.</value>
</string>
+ <string id="1429" name="cam_resolution">
+ <value>Cam resolution</value>
+ </string>
+ <string id="1430" name="cam_resolution_info">
+ <value>Changing the resolution affects bandwidth, bigger picture needs
more bandwith!</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/config.xml Wed Nov 30
03:31:08 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/config.xml Fri Dec 2
05:22:39 2011
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<config>
+<config
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:noNamespaceSchemaLocation="openmeetings-config.xsd">
<!-- URL/IP to use for the Server
if this value is empty it will try to connect to the
@@ -12,7 +14,7 @@
Port to use for the Server
To this port the default server lookup is done
-You can find all this configuraiton in your red5-Config in:
$RED5_HOME/conf/red5.properties
+You can find all this configuration in your red5-Config in:
$RED5_HOME/conf/red5.properties
-->
<rtmpport>1935</rtmpport>
@@ -212,6 +214,26 @@
-->
<defaultWhiteboardWidth>2400</defaultWhiteboardWidth>
<defaultWhiteboardHeight>1200</defaultWhiteboardHeight>
+
+<!-- Available Configurations -->
+
+<availableCameraResolutions>
+ <resolution type="4:3" width="40" height="30" isDefault="false" />
+ <resolution type="4:3" width="80" height="60" isDefault="false" />
+ <resolution type="4:3" width="120" height="90" isDefault="true" />
+ <resolution type="QQVGA 4:3" width="160" height="120"
isDefault="false" />
+ <resolution type="4:3" width="240" height="160" isDefault="false" />
+ <resolution type="HVGA 4:3" width="320" height="240" isDefault="false"
/>
+ <resolution type="4:3" width="480" height="320" isDefault="false" />
+ <resolution type="4:3" width="640" height="480" isDefault="false" />
+ <resolution type="XGA 4:3" width="1024" height="768" isDefault="false"
/>
+ <resolution type="16:9" width="256" height="150" isDefault="false" />
+ <resolution type="WQVGA 9:5" width="432" height="240"
isDefault="false" />
+ <resolution type="pseudo 16:9" width="480" height="234"
isDefault="false" />
+ <resolution type="16:9" width="512" height="300" isDefault="false" />
+ <resolution type="nHD 16:9" width="640" height="360" isDefault="false"
/>
+ <resolution type="16:9" width="1024" height="600" isDefault="false" />
+</availableCameraResolutions>
<!-- Module Configuration -->
=======================================
--- /trunk/singlewebapp/WebContent/src/base/remote/baseVideoView.lzx Mon
Jul 18 11:34:26 2011
+++ /trunk/singlewebapp/WebContent/src/base/remote/baseVideoView.lzx Fri
Dec 2 05:22:39 2011
@@ -36,12 +36,12 @@
</method>
<handler name="onwidth" args="w">
- if ($debug) Debug.info("onwidth ",this.width,this.height);
+ if ($debug) Debug.info("applySizeToVid
onwidth ",this.width,this.height);
this.applySizeToVid();
</handler>
<handler name="onheight" args="h">
- if ($debug) Debug.info("onheight ",this.width,this.height);
+ if ($debug) Debug.info("applySizeToVid
onheight ",this.width,this.height);
this.applySizeToVid();
</handler>
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
Fri Dec 2 03:12:38 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
Fri Dec 2 05:22:39 2011
@@ -8,7 +8,8 @@
or a self-video (broadcasting a cam/mic)
-->
-<class name="baseVideoObject" extends="view" bgcolor="0x000000"
width="132" height="120">
+<class name="baseVideoObject" extends="view"
+ bgcolor="0x000000" width="122" height="101">
<!--- @keywords private -->
<attribute name="chatpartnername" value="" type="string" />
@@ -79,10 +80,10 @@
//return;
}
- var prop1 = [this, "width"];
- var prop2 = [this, "height"];
- this.applyConstraintMethod("setItemContraints", prop1);
- this.applyConstraintMethod("setItemContraints", prop2);
+ //var prop1 = [this, "width"];
+ //var prop2 = [this, "height"];
+ //this.applyConstraintMethod("setItemContraints", prop1);
+ //this.applyConstraintMethod("setItemContraints", prop2);
this.setShadow();
if (this.publicSID == canvas.publicSID) {
@@ -157,7 +158,7 @@
]]>
</method>
- <!-- respect ratio and keep minimum width / height -->
+ <!-- respect ratio and keep minimum width / height
<method name="setItemContraints" args="w">
<![CDATA[
if (!this.respectRatio) {
@@ -176,6 +177,7 @@
this.setAttribute("height",h);
]]>
</method>
+ -->
<method name="updateAVSettingsSymbol" args="rcl">
@@ -521,12 +523,12 @@
if (roomClientObj.publicSID == this.publicSID) {
if (roomClientObj.publicSID == canvas.publicSID) {
- if ($debug) Debug.write("Set Mute for
Client :: ",roomClientObj.username);
+ if ($debug) Debug.write("Set Mute for
Client :: ",roomClientObj);
if (roomClientObj.micMuted) {
if ($debug) Debug.write("############ SET GAIN 0");
this._chatvideoinner._videostream.micro.setGain(0);
} else {
- if ($debug) Debug.write("############ SET GAIN 50");
+ if ($debug) Debug.write("############ SET GAIN 50
micro: ",this._chatvideoinner._videostream.micro);
this._chatvideoinner._videostream.micro.setGain(50);
}
}
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Mon Nov 7 10:31:26 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/editRecordStream.lzx
Fri Dec 2 05:22:39 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
-<!-- #######################
+<!---
Class editRecordStream
Description:
@@ -14,7 +14,7 @@
-->
<class name="editRecordStream" extends="labelExplorerBox" labelid="51"
- width="300" height="250" x="14" y="-340" >
+ width="300" height="286" x="14" y="-440" >
<attribute name="myvideocontainer" value="null" />
@@ -31,6 +31,9 @@
<attribute name="isInterview" value="false" type="boolean" />
+ <attribute name="cam_default_width" value="320" type="number" />
+ <attribute name="cam_default_height" value="240" type="number" />
+
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("this.myvideocontainer
",this.myvideocontainer);
@@ -117,7 +120,11 @@
var valCam = this.chosenCam;
var valMic = this.chosenMic;
var settings = this.chosenSetting;
+
this.myvideocontainer.setDefaultVideoSize(this.cam_default_width,this.cam_default_height);
+
+ //make a local ref so path is easier to read
var videoview =
this.myvideocontainer._chatvideoinner._videostream;
+
if ($debug)
Debug.write("this.myvideocontainer: ",this.myvideocontainer);
if ($debug) Debug.write(valCam,valMic,settings);
this.myvideocontainer.setAttribute('isremote',false);
@@ -140,6 +147,7 @@
if ($debug) Debug.warn("IS INTERVIEW ");
_camera.setQuality(0,98);
} else {
+ if ($debug) Debug.warn("Publishing Video with
Size :3: ",videoview.width,videoview.height);
_camera.setMode(videoview.width,videoview.height,canvas.framesPerSecond,true);
if ($debug) Debug.warn("IS NO INTERVIEW
");
_camera.setQuality(canvas.bandwidthNeededBest,canvas.camQualityBest);
@@ -265,11 +273,15 @@
this.parent.availibleMicsLabel.setAttribute("visibility",micVisible);
this.parent.availibleMics.setAttribute("visibility",micVisible);
this.parent.infoTextNoAV.setAttribute("visibility",textVisible);
+
this.parent.availibleResolutionsLabel.setAttribute("visibility",camVisible);
+
this.parent.availibleResolutionsWarning.setAttribute("visibility",camVisible);
+
this.parent.availibleResolutions.setAttribute("visibility",camVisible);
]]>
</handler>
</resetCombobox>
- <labelText name="availibleCamsLabel" labelid="52" fontsize="11" x="10"
y="80" width="$once{ parent.width-20 }" />
+ <labelText name="availibleCamsLabel" labelid="52" fontsize="11"
+ x="10" y="80" width="$once{ parent.width-20 }" />
<resetCombobox fontsize="11" name="availibleCams" x="10" y="100"
width="280" editable="false">
<handler name="oninit">
@@ -290,8 +302,9 @@
</handler>
</resetCombobox>
-
-
+ <labelText name="availibleMicsLabel" labelid="53" fontsize="11"
+ x="10" y="120" width="$once{ parent.width-20 }" />
+
<resetCombobox fontsize="11" name="availibleMics" x="10" y="140"
width="280" editable="false">
<handler name="oninit">
<![CDATA[
@@ -312,13 +325,50 @@
</resetCombobox>
<labelText name="infoTextNoAV" labelid="452" multiline="true"
width="280"
- fontsize="11" x="10" y="80" visibility="hidden" />
-
- <labelText name="availibleMicsLabel" labelid="53" fontsize="11"
- x="10" y="120" width="$once{ parent.width-20 }" />
+ fontsize="11" x="10" y="180" visibility="hidden" />
+
+ <labelText name="availibleResolutionsLabel" labelid="1429"
+ fontsize="11" x="10" y="164" width="$once{ parent.width-20 }"
/>
+
+ <view name="availibleResolutionsWarning" x="272" y="164"
+ resource="warning_icon_popup_devices_rsc" clickable="true" >
+ <labelTooltip multiline="true" labelid="1430" />
+ </view>
+
+ <resetCombobox fontsize="11" name="availibleResolutions" x="10"
shownitems="10"
+ y="184" width="280" editable="false" >
+ <!--- @keywords private -->
+ <attribute name="counter" value="0" />
+ <handler name="onselect" args="item">
+ //if ($debug) Debug.write("onselect w ", item.cam_width);
+ //if ($debug) Debug.write("onselect h ", item.cam_height);
+ parent.cam_default_width = item.cam_width;
+ parent.cam_default_height = item.cam_height;
+ </handler>
+ <textlistitem
datapath="myConfigSet:/config/availableCameraResolutions/resolution" >
+ <!--- @keywords private -->
+ <attribute name="cam_width" value="320" type="number" />
+ <!--- @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;
+ </handler>
+ </textlistitem>
+ </resetCombobox>
<!-- Remember Me -->
- <labelCheckbox name="holddatainSO" labelid="762" x="10" y="210" >
+ <labelCheckbox name="holddatainSO" labelid="762" x="10" y="260" >
<handler name="oninit">
var g = canvas.getUserData();
var save = g["savecamdata"];
@@ -328,7 +378,7 @@
</labelCheckbox>
<simpleLabelButton fontsize="11" visibility="${
(parent.isInterview) ? 'visible' : 'hidden' }"
- labelid="54" x="80" y="180" width="100">
+ labelid="54" x="80" y="240" width="100">
<handler name="onclick">
this.parent.storelocaldata();
this.parent.chosenCam = parent.availibleCams.getValue();
@@ -343,14 +393,14 @@
</simpleLabelButton>
<simpleLabelButton fontsize="11" visibility="${
(parent.isInterview) ? 'visible' : 'hidden' }"
- labelid="918" x="190" y="180" width="100">
+ labelid="918" x="190" y="240" width="100">
<handler name="onclick">
parent.close();
</handler>
</simpleLabelButton>
<simpleLabelButton fontsize="11" visibility="${
(!parent.isInterview) ? 'visible' : 'hidden' }"
- labelid="54" x="190" y="180" width="100">
+ labelid="54" x="190" y="240" width="100">
<handler name="onclick">
this.parent.storelocaldata();
this.parent.chosenCam = parent.availibleCams.getValue();
=======================================
--- /trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx
Sat Sep 17 08:15:38 2011
+++ /trunk/singlewebapp/WebContent/src/modules/conference/video/library.lzx
Fri Dec 2 05:22:39 2011
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+
+ <resource name="warning_icon_popup_devices_rsc"
src="resources/messagebox_warning.png" />
+
<resource name="chatbgitem" src="resources/bgitemvideochat.swf" />
<resource name="showusercontextclose" src="resources/error.png" />
=======================================
---
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
Sun Sep 18 07:58:10 2011
+++
/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
Fri Dec 2 05:22:39 2011
@@ -9,9 +9,14 @@
<class name="videoObjectBroadcast" extends="baseVideoObject"
isremote="false">
- <attribute name="ratioW" value="1" />
- <attribute name="ratioH" value="1" />
- <handler name="oninit">
+
+ <attribute name="ratioW" value="1" />
+ <attribute name="ratioH" value="1" />
+
+ <attribute name="videoInsetX" value="2" type="number" />
+ <attribute name="videoInsetY" value="21" type="number" />
+
+ <handler name="oninit">
<![CDATA[
//Display widget defined in mother class
this.syncuser.bringToFront()
@@ -19,17 +24,30 @@
this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
- </handler>
-
- <view name="_chatvideoinner" x="1" y="20" height="${parent.height-21}"
width="${parent.width-2}">
+ </handler>
+
+ <!---
+ Change the video resolution by chaning pod size
+ -->
+ <method name="setDefaultVideoSize" args="w,h">
+ this.setAttribute("width",w+this.videoInsetX);
+ this.setAttribute("height",h+this.videoInsetY);
+ if ($debug)
Debug.info("setDefaultVideoSize ",this.width,this.height);
+ </method>
+
+ <view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
+ y="$once{ parent.videoInsetY-1 }"
+ height="${parent.height-parent.videoInsetY}"
+ width="${parent.width-parent.videoInsetX}">
+
<view name="r" resource="chatbgitem" x="1" y="2"
stretches="both"
width="$once{parent.width}"
height="$once{parent.height}" />
+
<handler name="oninit">
this.r.setAttribute('frame',5);
</handler>
- <baseVideoStreamDevice name="_videostream" mode="broadcast"
- width="${parent.width}"
height="${parent.height}" bgcolor="black">
+ <baseVideoStreamDevice name="_videostream" mode="broadcast"
bgcolor="black">
<handler name="onlevel">
<![CDATA[
//if (this.level > 0) {
--
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.
