Author: solomax
Date: Fri Aug 19 16:23:35 2016
New Revision: 1756929
URL: http://svn.apache.org/viewvc?rev=1756929&view=rev
Log:
[OPENMEETINGS-1408] current work is merged into 3.1.x
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/resources/information.png
- copied unchanged from r1756928,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/resources/information.png
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/resources/level_meter.png
- copied unchanged from r1756928,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/resources/level_meter.png
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/resources/run.png
- copied unchanged from r1756928,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/resources/run.png
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/resources/stop.png
- copied unchanged from r1756928,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/resources/stop.png
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/resources/webstart_record.png
- copied unchanged from r1756928,
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/resources/webstart_record.png
Removed:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/audioVideoTest/
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/plugins/
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/rest/
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/testVideoObject.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
Fri Aug 19 16:23:35 2016
@@ -33,10 +33,9 @@
</switch>
<attribute name="showWindowEffect" value="false" type="boolean" />
-
<attribute name="annimationStartStyle" value="center" type="string" />
-
<attribute name="annimationColor" value="$once{
canvas.getThemeColor('basebgcolorizer') }" type="string" />
+ <attribute name="dropShadow" value="true" type="boolean" />
<event name="animationInited" />
@@ -86,8 +85,11 @@
</method>
<method name="setShadow" args="bool">
+ <![CDATA[
+ if (!dropShadow) {
+ return;
+ }
this.hasshadow = bool;
- <![CDATA[
if (this.isinited){
this.normalMC = this.getDisplayObject();
//Debug.write(this.normalMC);
@@ -96,9 +98,9 @@
this.displacementMap = new DropShadowFilter();
this.normalMC.filters = [this.displacementMap];
}
- ]]>
- </method>
-
+ ]]>
+ </method>
+
<!--- The Title of this Box -->
<attribute name="title" value="defaulttitle" type="string" />
@@ -371,25 +373,25 @@
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2
}"
x="1" y="1" bgcolor="$once{
canvas.getThemeColor('mainBackgroundColor') }" />
- <view x="1" y="1" width="${ this.parent.width-2 }" height="20" >
+ <view name="_titlebar" x="1" y="1" width="${ this.parent.width-2 }"
height="20" >
<gradientview x="0" width="${ this.parent.width }" height="20"
colorFrom="$once{
canvas.getThemeColor('baseMousecolorizer') }"
colorTo="$once{
canvas.getThemeColor('styleMenuBarBaseColor') }" >
</gradientview>
- <text fontsize="10" height="17" x="6" y="1" text="${
this.parent.parent.title }"
+ <text fontsize="10" height="17" x="6" y="1" text="${
this.parent.parent.title }"
fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
-
- <view visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-20 }"
- y="2" resource="btn_presenter_close"
- onmouseover="this.setAttribute('frame',2)"
- onmouseout="this.setAttribute('frame',1)"
- onmousedown="this.setAttribute('frame',3)"
- onmouseup="this.setAttribute('frame',1)" >
+
+ <view visible="${ this.parent.parent.closable }" x="${
this.parent.parent.width-20 }"
+ y="2" resource="btn_presenter_close"
+ onmouseover="this.setAttribute('frame',2)"
+ onmouseout="this.setAttribute('frame',1)"
+ onmousedown="this.setAttribute('frame',3)"
+ onmouseup="this.setAttribute('frame',1)" >
<handler name="onclick">
this.parent.parent.close();
- </handler>
+ </handler>
</view>
</view>
<handler name="onaddsubview" args="v">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
Fri Aug 19 16:23:35 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,29 +26,20 @@
</passthrough>
</when>
</switch>
-
<script>
<![CDATA[
-
-
ExternalInterface.addCallback("redirectToUrlCallback",
redirectToUrlCallback);
- ExternalInterface.addCallback("getBrowserInfoCallback",
getBrowserInfoCallback);
- ExternalInterface.addCallback("getBrowserLangCallback",
getBrowserLangCallback);
-
+ ExternalInterface.addCallback("getBrowserInfoCallback",
getBrowserInfoCallback);
+ ExternalInterface.addCallback("getBrowserLangCallback",
getBrowserLangCallback);
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
var browserInfoReturnObject = null;
var browserLangReturnObject = null;
-
function redirectToUrl(url, returnObject) {
-
redirectToUrlReturnObject = returnObject;
-
ExternalInterface.call("redirectToUrl", url);
-
- //lz.Browser.callJS("redirectToUrl",callback,this.redirectURL);
}
function redirectToUrlCallback(returnValue) {
@@ -57,42 +48,30 @@
redirectToUrlReturnObject.callback(returnValue);
}
}
-
function getBrowserInfo(returnObject) {
-
- browserInfoReturnObject = returnObject;
-
- ExternalInterface.call("getBrowserInfo");
-
- //lz.Browser.callJS("getBrowserInfo",callback);
- }
-
- function getBrowserInfoCallback(returnValue) {
- if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
- if (browserInfoReturnObject != null) {
- browserInfoReturnObject.callback(returnValue);
- }
- }
-
-
- function getBrowserLang(returnObject) {
-
- browserLangReturnObject = returnObject;
-
- ExternalInterface.call("getBrowserLang");
-
- //lz.Browser.callJS("getBrowserLang",callback);
- }
-
- function getBrowserLangCallback(returnValue) {
- if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
- if (browserLangReturnObject != null) {
- browserLangReturnObject.callback(returnValue);
- }
- }
+ browserInfoReturnObject = returnObject;
+ ExternalInterface.call("getBrowserInfo");
+ }
-
+ function getBrowserInfoCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
+ if (browserInfoReturnObject != null) {
+ browserInfoReturnObject.callback(returnValue);
+ }
+ }
+
+ function getBrowserLang(returnObject) {
+ browserLangReturnObject = returnObject;
+ ExternalInterface.call("getBrowserLang");
+ }
+
+ function getBrowserLangCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
+ if (browserLangReturnObject != null) {
+ browserLangReturnObject.callback(returnValue);
+ }
+ }
]]>
</script>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/library.lzx
Fri Aug 19 16:23:35 2016
@@ -19,15 +19,15 @@
-->
<library>
- <include href="remote/" />
- <include href="components/" />
- <include href="hibernate/" />
- <include href="contentviews/" />
- <include href="navi/" />
+ <include href="remote/" />
+ <include href="components/" />
+ <include href="hibernate/" />
+ <include href="contentviews/" />
+ <include href="navi/" />
<!-- for main.lzx -->
<include href="externalJavaScript.lzx" />
- <include href="functions.lzx" />
+ <include href="functions.lzx" />
<include href="mainAttributes.lzx" />
<include href="mainDatasets.lzx" />
<include href="mainMethods.lzx" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
Fri Aug 19 16:23:35 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -55,38 +55,37 @@
<!-- get values from public/config.xml -->
<dataset type="http" name="myConfigSet" request="false"
ondata="parent.mainTheme.loadTheme()" proxied="false">
- <handler name="oninit">
- var d = new Date();
- this.setAttribute("src", canvas.getServerBaseUrl() +
"config.xml?random=" + d.getTime());
- this.doRequest();
- </handler>
- <handler name="ondata">
- if ($debug) Debug.write("ondata");
- </handler>
- <handler name="onerror" args="e">
- if ($debug) Debug.write("onerror",e);
- </handler>
- <handler name="ontimeout" args="e">
- if ($debug) Debug.write("ontimeout",e);
- </handler>
+ <handler name="oninit">
+ var d = new Date();
+ this.setAttribute("src", canvas.getServerBaseUrl() +
"config.xml?random=" + d.getTime());
+ this.doRequest();
+ </handler>
+ <handler name="ondata">
+ if ($debug) Debug.write("ondata");
+ </handler>
+ <handler name="onerror" args="e">
+ if ($debug) Debug.write("onerror",e);
+ </handler>
+ <handler name="ontimeout" args="e">
+ if ($debug) Debug.write("ontimeout",e);
+ </handler>
</dataset>
<!-- get values from public/config.xml -->
<dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()"
proxied="false">
- <method name="loadTheme">
- var d = new Date();
- this.setAttribute("src", canvas.getServerBaseUrl() +
"theme.xml?random=" + d.getTime());
- this.doRequest();
- </method>
- <handler name="ondata">
- if ($debug) Debug.write("ondata");
- </handler>
- <handler name="onerror" args="e">
- if ($debug) Debug.write("onerror",e);
- </handler>
- <handler name="ontimeout" args="e">
- if ($debug) Debug.write("ontimeout",e);
- </handler>
+ <method name="loadTheme">
+ var d = new Date();
+ this.setAttribute("src", canvas.getServerBaseUrl() +
"theme.xml?random=" + d.getTime());
+ this.doRequest();
+ </method>
+ <handler name="ondata">
+ if ($debug) Debug.write("ondata");
+ </handler>
+ <handler name="onerror" args="e">
+ if ($debug) Debug.write("onerror",e);
+ </handler>
+ <handler name="ontimeout" args="e">
+ if ($debug) Debug.write("ontimeout",e);
+ </handler>
</dataset>
-
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Fri Aug 19 16:23:35 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -136,9 +136,9 @@
<method name="getColorForUser">
<![CDATA[
- var colorArray =
[0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
+ var colorArray =
[0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
0xE8DB87,0xAFFFB8,0xBED4FF,0xE0BBE8,0xFFBBA5];
- return colorArray[Math.round(Math.random()*10)];
+ return colorArray[Math.round(Math.random()*10)];
]]>
</method>
@@ -156,20 +156,20 @@
</method>
<method name="getHttpHost">
- <![CDATA[
+ <![CDATA[
if (canvas.httphostlocal != null && canvas.httphostlocal.length
> 0) {
return canvas.httphostlocal;
}
return canvas.rtmphostlocal;
]]>
</method>
-
+
<method name="getUrl">
<![CDATA[
return canvas.protocol + '://' + getHttpHost() + ':' +
canvas.red5httpport + canvas.httpRootKey;
]]>
</method>
-
+
<method name="getServicesUrl">
<![CDATA[
return getUrl() + 'services/';
@@ -189,7 +189,7 @@
</method>
<method name="myinit">
- <![CDATA[
+ <![CDATA[
canvas.mediaerrortimeout = 30000;
canvas.medialoadtimeout = 30000;
@@ -198,7 +198,7 @@
//Set Config-values by public/config.xml, see comments on
public/config.xml
if (!canvas.isCluster) {
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
- }
+ }
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
@@ -295,23 +295,49 @@
canvas.setAttribute('wicketroomid',
Number(wicketroomid));
hib.userScope = canvas.wicketroomid;
}
- canvas.setAttribute('wicketsid', null);
+ canvas.setAttribute('wicketsid', null);
var wicketsid = lz.Browser.getInitArg('wicketsid');
if (wicketsid != undefined) {
canvas.setAttribute('wicketsid', wicketsid);
+ canvas.setAttribute('sessionId', wicketsid);
}
- this.setBaseColors();
-
- //Debug.write("rtmphostlocal,rtmphost:
",canvas.rtmphostlocal,canvas.rtmphost);
- var src = hib.getUrl();
-
- canvas.thishib.setAttribute('src',src);
- canvas.thishib.loaderVar = new lz.autoLoader(canvas);
- canvas.thishib.loaderVar._src.setAttribute('text',src);
- canvas.thishib.connect();
- ]]>
+ this.setColors();
+ if ($debug) Debug.info("###################### -3 ");
+ var swf = lz.Browser.getInitArg('swf');
+ if ($debug) Debug.info("swf ", swf);
+ if (swf == 'settings') {
+ canvas.currentClient = {canVideo: true};
+ canvas.currentRoomObj = {audioOnly: false};
+ canvas.showWindowEffect = 'n';
+ var lbls = ExternalInterface.call("getStringLabels");
+ if ($debug) Debug.info("###################### -3 ",
lbls);
+ if (lbls) {
+ setLabelObjectByHundred(0, lbls);
+ }
+ canvas.main_content.setAttribute('visible', true);
+ new lz.editRecordStreamSWF10(canvas.main_content,{
+ allowDragging: false,
+ dropShadow: false,
+ standalone: true,
+ name: "editRecordStream",
+ doDefaultAnimation: false,
+ isInterview: true,
+ interviewPodId:
this.parent.parent.interviewPodId,
+ isSyncUpdate: true,
+ x: 0, y: 0, initY: 0
+ });
+ } else {
+ hib.userScope = canvas.wicketroomid;
+ var src = hib.getUrl();
+
+ canvas.thishib.setAttribute('src',src);
+ canvas.thishib.loaderVar = new lz.autoLoader(canvas);
+ canvas.thishib.loaderVar._src.setAttribute('text',src);
+ canvas.thishib.connect();
+ }
+ ]]>
</method>
-
+
<netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave"
remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
if ($debug) Debug.write("#############
logicalRoomLeave: ",value);
@@ -723,7 +749,7 @@
return tResColor;
</method>
- <method name="setBaseColors">
+ <method name="setColors">
defaultstyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
itemStyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
menuStyle.setAttribute("basecolor",canvas.getThemeColor('styleMenuBarBaseColor'));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStream.lzx
Fri Aug 19 16:23:35 2016
@@ -169,26 +169,26 @@
@param number delay The time it should seek, for Live-Streams
this value should be -1
-->
<method name="playStream" args="_streamName, delay">
- <![CDATA[
- this.streamName = "" + _streamName;
- this.delay=delay;
- if (this._ns!=null){
- this._stop();
- }
- this.mode = "play";
- this.createStream();
- //invokes Method in baseVideoView which shows the stream
- this.attachVideo(this._ns);
- //FIXME: Commented out, cause this leads to
Buffer-Full/Buffer-Empty Events
- //after re-syncing the stream
- //this.setBuffer(0.1);
- if ($debug) Debug.write("Play Stream "+streamName);
- if (delay == 0) {
- this._ns.play(streamName);
- } else {
- this._ns.play(streamName,delay);
- }
- ]]>
+ <![CDATA[
+ this.streamName = "" + _streamName;
+ this.delay = delay;
+ if (this._ns != null){
+ this._stop();
+ }
+ this.mode = "play";
+ this.createStream();
+ //invokes Method in baseVideoView which shows the stream
+ this.attachVideo(this._ns);
+ //FIXME: Commented out, cause this leads to
Buffer-Full/Buffer-Empty Events
+ //after re-syncing the stream
+ //this.setBuffer(0.1);
+ if ($debug) Debug.write("Play Stream '" + streamName + "'");
+ if (delay == 0) {
+ this._ns.play(streamName);
+ } else {
+ this._ns.play(streamName,delay);
+ }
+ ]]>
</method>
<method name="justPlayStream" args="_streamName, delay">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/baseVideoStreamDevice.lzx
Fri Aug 19 16:23:35 2016
@@ -15,7 +15,6 @@
which are thrown, once a device was set -->
<class name="baseVideoStreamDevice" extends="baseVideoStream">
-
<switch>
<when property="$as3">
<passthrough>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/main.lzx
Fri Aug 19 16:23:35 2016
@@ -43,11 +43,8 @@
<include href="base/" /><!-- attributes,methods,datasets,are moved into
/base -->
<include href="resources/" />
<include href="modules/" />
- <include href="plugins/" />
- <include href="testVideoObject.lzx" />
<include href="video/" />
<include href="screensharing/" />
- <include href="audioVideoTest/" />
<include href="lzrecorder/" />
<include href="commonVideoViewContentSWF10.lzx" />
<include href="dragHelper.lzx" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Fri Aug 19 16:23:35 2016
@@ -51,6 +51,8 @@
<attribute name="myvideocontainer" value="null" />
+ <attribute name="standalone" value="false" type="boolean" />
+ <attribute name="initY" value="40" type="number" />
<attribute name="chosenCam" value="null" />
<attribute name="chosenMic" value="null" />
<attribute name="chosenSetting" value="null" />
@@ -112,6 +114,11 @@
<![CDATA[
//Make this view the upmost in the z-Index order
canvas.inner.bringToFront();
+ if (standalone) {
+ _titlebar.setAttribute('visible', false);
+ lz.Cursor.showHandCursor(false);
+ lz.Cursor.unlock();
+ }
this.counterDelegate = new LzDelegate(this, "count");
@@ -133,7 +140,7 @@
if (this.doDefaultAnimation && !canvas.isInterview) {
this._chooseDeviceAnimation.setAttribute('started', true);
} else {
- this.setAttribute("y", 40);
+ this.setAttribute("y", initY);
}
this.initItemsAndDefaultAttachCamera();
}
@@ -198,10 +205,10 @@
parent.setUserAVSettings.doCall();
]]>
- </handler>
- </netRemoteCallHib>
+ </handler>
+ </netRemoteCallHib>
- <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings"
remotecontext="$once{ canvas.thishib }" >
+ <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings"
remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return
parent.parent.chosenSetting;</method></netparam>
<netparam><method name="getValue">return
parent.parent.remoteMessage;</method></netparam>
<netparam><method name="getValue">return
parent.parent.cam_default_width;</method></netparam>
@@ -215,12 +222,12 @@
parent.currentClient = value;
parent.doStartConference();
]]>
- </handler>
- </netRemoteCallHib>
+ </handler>
+ </netRemoteCallHib>
<method name="storelocaldata">
<![CDATA[
- //Debug.write("sharedobject store ");
+ //if ($debug) Debug.write("sharedobject store::
[width, height] : [" + this.cam_default_width + ", " + this.cam_default_height
+ "]");
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
if (g==null) g = new Array();
@@ -786,7 +793,7 @@
width="${ parent.width-50 }" multiline="true" />
<!-- Remember Me -->
- <labelCheckbox name="holddatainSO" labelid="762" x="10" y="${
parent.height-20 }" >
+ <labelCheckbox name="holddatainSO" labelid="762" x="10" y="${
parent.height-20 }" visible="${ !parent.standalone }" >
<switch>
<when property="$as3">
<passthrough>
@@ -803,8 +810,8 @@
</handler>
</labelCheckbox>
- <simpleLabelButton fontsize="11" visibility="${ (canvas.isInterview) ?
'visible' : 'hidden' }"
- labelid="54" x="${ parent.width-220
}" y="${ parent.height-50 }" width="100">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone
&& canvas.isInterview }" labelid="54" x="${ parent.width-220 }"
+ y="${ parent.height-50 }" width="100">
<handler name="onclick">
parent.cleanVideos();
this.parent.storelocaldata();
@@ -819,16 +826,16 @@
</handler>
</simpleLabelButton>
- <simpleLabelButton fontsize="11" visibility="${ (canvas.isInterview) ?
'visible' : 'hidden' }"
- labelid="918" x="${ parent.width-110
}" y="${ parent.height-50 }" width="100">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone
&& canvas.isInterview }" labelid="918" x="${ parent.width-110 }"
+ y="${ parent.height-50 }" width="100">
<handler name="onclick">
parent.cleanVideos();
parent.close();
</handler>
</simpleLabelButton>
- <simpleLabelButton fontsize="11" visibility="${ (!canvas.isInterview) ?
'visible' : 'hidden' }"
- labelid="761" width="160" x="${
parent.width-170 }" y="${ parent.height-50 }" height="28">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone
&& !canvas.isInterview }" labelid="761" width="160" x="${
parent.width-170 }"
+ y="${ parent.height-50 }" height="28">
<handler name="onclick">
parent.cleanVideos();
this.parent.storelocaldata();
@@ -843,6 +850,13 @@
</handler>
</simpleLabelButton>
+ <simpleLabelButton fontsize="11" visible="${ parent.standalone }"
labelid="144" width="160" x="${ parent.width-170 }"
+ y="${ parent.height-50 }" height="28">
+ <handler name="onclick">
+ parent.cleanVideos();
+ this.parent.storelocaldata();
+ </handler>
+ </simpleLabelButton>
</class>
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/library.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/library.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/library.lzx
Fri Aug 19 16:23:35 2016
@@ -19,9 +19,18 @@
-->
<library>
-
+ <!-- APL author sebawagner -->
+ <resource name="level_meter_rsc" src="resources/level_meter.png" />
+ <!-- APL author sebawagner -->
+ <resource name="test_setup_record_rsc"
src="resources/webstart_record.png" />
+ <!-- APL author sebawagner -->
+ <resource name="test_setup_play_rsc" src="resources/run.png" />
+ <!-- APL author sebawagner -->
+ <resource name="test_setup_stop_rsc" src="resources/stop.png" />
+ <!-- FamFam Icon Set -->
+ <resource name="test_setup_info_rsc" src="resources/information.png" />
<!-- FamFam Icon Creative Commons -->
- <resource name="warning_icon_popup_devices_rsc" src="resources/error.png"
/>
+ <resource name="warning_icon_popup_devices_rsc"
src="resources/error.png" />
<!-- APL author sebawagner -->
<resource name="chatbgitem" src="resources/profile_pic.jpg" />
@@ -30,13 +39,13 @@
<resource name="resyncuser_rsc" src="resources/arrow_refresh_small.png"
/>
<!-- APL author sebawagner -->
- <resource name="mic_rsc" src="resources/micro.png" />
-
- <!-- APL author sebawagner -->
+ <resource name="mic_rsc" src="resources/micro.png" />
+
+ <!-- APL author sebawagner -->
<resource name="speaking" src="resources/speaking.png" />
- <!-- IconFinder Creative Commons -->
- <resource name="volume" src="resources/volume.png" />
+ <!-- IconFinder Creative Commons -->
+ <resource name="volume" src="resources/volume.png" />
<!-- FamFam Icon Creative Commons -->
<resource name="mute_btn_rsc">
@@ -45,7 +54,7 @@
</resource>
<!-- APL author sebawagner -->
- <resource name="mute_micro_btn_rsc">
+ <resource name="mute_micro_btn_rsc">
<frame src="resources/mute_micro.png" />
<frame src="resources/mute_micro_red.png" />
</resource>
@@ -53,13 +62,13 @@
<!-- APL author sebawagner -->
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
- <include href="changeDevice.lzx" />
- <include href="videoUserProfilePicSWF10.lzx" />
- <include href="editRecordStreamSWF10.lzx" />
- <include href="baseVideoObject.lzx" />
- <include href="videoObjectPlayBroadcast.lzx" />
- <include href="videoObjectTestBroadcast.lzx" />
- <include href="videoObjectPlayTestBroadcast.lzx" />
- <include href="volumeSlider.lzx" />
-
+ <include href="changeDevice.lzx" />
+ <include href="videoUserProfilePicSWF10.lzx" />
+ <include href="editRecordStreamSWF10.lzx" />
+ <include href="baseVideoObject.lzx" />
+ <include href="videoObjectPlayBroadcast.lzx" />
+ <include href="videoObjectTestBroadcast.lzx" />
+ <include href="videoObjectPlayTestBroadcast.lzx" />
+ <include href="volumeSlider.lzx" />
+
</library>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Fri Aug 19 16:23:35 2016
@@ -43,6 +43,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.SOAPLogin;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.room.poll.CreatePollDialog;
@@ -52,6 +53,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.json.JSONArray;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -63,6 +66,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -84,11 +88,6 @@ public class RoomPanel extends BasePanel
this(id, new PageParameters());
}
- private String getFlashFile(StringValue type) {
- String fmt = SWF_TYPE_NETWORK.equals(type.toString()) ?
"networktesting%s.swf10.swf" : "main%s.swf11.swf";
- return String.format(fmt, DEVELOPMENT ==
getApplication().getConfigurationType() ? "debug" : "");
- }
-
private static PageParameters addServer(PageParameters pp, Server s) {
return pp.add("protocol", s.getProtocol()).add("host",
s.getAddress()).add("port", s.getPort()).add("context", s.getWebapp());
}
@@ -155,8 +154,7 @@ public class RoomPanel extends BasePanel
if (roomId != null) {
spp.mergeWith(new PageParameters().add(WICKET_ROOM_ID,
roomId));
}
- String swf = getFlashFile(pp.get("swf")) + new
PageParametersEncoder().encodePageParameters(spp);
- add(new Label("init", String.format("initSwf('%s');",
swf)).setEscapeModelStrings(false));
+ add(new Label("init",
getInitFunction(spp)).setEscapeModelStrings(false));
add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
private static final long serialVersionUID = 1L;
@@ -290,6 +288,33 @@ public class RoomPanel extends BasePanel
}
}
+ public String getInitFunction(PageParameters pp) {
+ String initStr = null;
+ String swf = getFlashFile(pp);
+ if (!Strings.isEmpty(swf)) {
+ initStr = String.format("var labels = %s;
initSwf(%s);", getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429,
1430, 775, 452, 767, 764, 765, 918, 54, 761, 762, 144)
+ , new JSONObject().put("src", swf + new
PageParametersEncoder().encodePageParameters(pp)).toString());
+ }
+ return initStr;
+ }
+
+ private String getFlashFile(PageParameters pp) {
+ StringValue type = pp.get("swf");
+ String fmt = "main%s.swf11.swf";
+ if (SWF_TYPE_NETWORK.equals(type.toString())) {
+ fmt = "networktesting%s.swf10.swf";
+ }
+ return String.format(fmt, DEVELOPMENT ==
getApplication().getConfigurationType() ? "debug" : "");
+ }
+
+ public static String getStringLabels(long... ids) {
+ JSONArray arr = new JSONArray();
+ for (long id : ids) {
+ arr.put(new JSONObject().put("id", id).put("value",
Application.getString(id)));
+ }
+ return arr.toString();
+ }
+
private String getPublicSid() {
return
getRequest().getRequestParameters().getParameterValue(PARAM_PUBLIC_SID).toString();
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Fri Aug 19 16:23:35 2016
@@ -17,26 +17,31 @@
* under the License.
*/
-function initSwf(swfurl) {
- var general = {
- url : swfurl,
- bgcolor : '#ffffff',
- width : '100%',
- height : '100%',
- id : 'lzapp',
- __lzminimumversion : 8
- };
- var options = $.extend({}, general, {allowfullscreen : 'true'});
+function initSwf(_options) {
+ var options = $.extend({
+ allowfullscreen : 'true',
+ bgcolor : '#ffffff',
+ width : '100%',
+ height : '100%',
+ id : 'lzapp',
+ __lzminimumversion : 8
+ }, _options);
$('#header, #topControls, #chatPanel').hide();
$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
- var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
- .attr('src', "public/" + options.url)
- .attr('wmode', 'direct').attr('allowfullscreen', true)
+ var embed = $('<embed>')
+ .attr('quality', 'high')
+ .attr('bgcolor', options.bgcolor)
+ .attr('src', "public/" + options.src)
+ .attr('wmode', 'direct')
+ .attr('allowfullscreen', true)
.attr('width', options.width).attr('height', options.height)
- .attr('id', 'lzapp').attr('name', 'lzapp')
- .attr('flashvars', escape($.param(general)))
- .attr('swliveconnect', true).attr('align', 'middle')
- .attr('allowscriptaccess', 'sameDomain').attr('type',
'application/x-shockwave-flash')
+ .attr('id', 'lzapp')
+ .attr('name', 'lzapp')
+ //.attr('flashvars', $.param(options))
+ .attr('swliveconnect', true)
+ .attr('align', 'middle')
+ .attr('allowscriptaccess', 'sameDomain')
+ .attr('type', 'application/x-shockwave-flash')
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
@@ -45,4 +50,7 @@ function roomExit() {
$('div[id="contents"], div[id="contents"] > div').css('height', 'auto');
window.location.hash = "#rooms/public";
$('#lzappContainer').remove();
-}
\ No newline at end of file
+}
+function getStringLabels() {
+ return labels;
+}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainDatasets.lzx
Fri Aug 19 16:23:35 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Fri Aug 19 16:23:35 2016
@@ -562,9 +562,6 @@
itemStyle.setAttribute("basecolor",canvas.getThemeColor('basebgcolorizer'));
menuStyle.setAttribute("basecolor",canvas.getThemeColor('styleMenuBarBaseColor'));
main_content.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
- if (!!canvas.setBaseColors) {
- canvas.setBaseColors();
- }
</method>
<method name="getPictureUrl" args="pictureuri,extraParams">
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Fri Aug 19 16:23:35 2016
@@ -227,7 +227,7 @@
<method name="storelocaldata">
<![CDATA[
- if ($debug) Debug.write("sharedobject store:: [width,
height] : [" + this.cam_default_width + ", " + this.cam_default_height + "]");
+ //if ($debug) Debug.write("sharedobject store::
[width, height] : [" + this.cam_default_width + ", " + this.cam_default_height
+ "]");
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
if (g==null) g = new Array();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Fri Aug 19 16:23:35 2016
@@ -36,7 +36,7 @@ function initSwf(_options) {
.attr('width', options.width).attr('height', options.height)
.attr('id', 'lzapp')
.attr('name', 'lzapp')
- .attr('flashvars', $.param(options))
+ //.attr('flashvars', $.param(options))
.attr('swliveconnect', true)
.attr('align', 'middle')
.attr('allowscriptaccess', 'sameDomain')
@@ -44,7 +44,6 @@ function initSwf(_options) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
-
function getStringLabels() {
return labels;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756929&r1=1756928&r2=1756929&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Fri Aug 19 16:23:35 2016
@@ -36,7 +36,7 @@ function initSwf(_options) {
.attr('width', options.width).attr('height', options.height)
.attr('id', 'lzapp')
.attr('name', 'lzapp')
- .attr('flashvars', $.param(options))
+ //.attr('flashvars', $.param(options))
.attr('swliveconnect', true)
.attr('align', 'middle')
.attr('allowscriptaccess', 'sameDomain')
@@ -44,7 +44,6 @@ function initSwf(_options) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
-
function getStringLabels() {
return labels;
}
